Changeset 04803bf in mainline for uspace/lib/c/arch/abs32le/include/faddr.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes (needs fixes).

File:

• uspace/lib/c/arch/abs32le/include/faddr.h (moved) (moved from boot/generic/gentypes.h ) (3 diffs)

uspace/lib/c/arch/abs32le/include/faddr.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2010 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup libabs32le
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef BOOT_GENTYPES_H_
-#define BOOT_GENTYPES_H_
+#ifndef LIBC_abs32le_FADDR_H_
+#define LIBC_abs32le_FADDR_H_
 
-#define NULL 0
-#define false 0
-#define true 1
+#include <libarch/types.h>
 
-typedef unsigned long size_t;
+#define FADDR(fptr)  ((uintptr_t) (fptr))
 
 #endif