[haiku-commits] BRANCH mmadia-github.separate-build-environment - in headers/build: os_target/support config_target
- From: mmadia-github.separate-build-environment <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 5 Aug 2012 18:49:19 +0200 (CEST)
added 3 changesets to branch
'refs/remotes/mmadia-github/separate-build-environment'
old head: b95dc538154d9abb4de3fca1365397e62a2d0628
new head: b5ba2b149da91e4241c5f9a8d5e7f6d33f844dbd
----------------------------------------------------------------------------
9d5b08f: Whitespace cleanup. No functional change.
2651185: Made corrections to typedefs. Review appreciated.
b5ba2b1: Whitespace cleanup. No functional change.
[ Matt Madia <mattmadia@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 174 insertions(+), 155 deletions(-)
headers/build/config_target/target_HaikuConfig.h | 57 ++--
.../build/os_target/support/target_SupportDefs.h | 272 ++++++++--------
############################################################################
Commit: 9d5b08fa27cc9ae0024a5362df688f161186a490
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sun Aug 5 11:39:41 2012 UTC
Whitespace cleanup. No functional change.
----------------------------------------------------------------------------
diff --git a/headers/build/os_target/support/target_SupportDefs.h
b/headers/build/os_target/support/target_SupportDefs.h
index ffcb0c6..61adec9 100644
--- a/headers/build/os_target/support/target_SupportDefs.h
+++ b/headers/build/os_target/support/target_SupportDefs.h
@@ -30,7 +30,7 @@ typedef __haiku_build_haiku_int64
_haiku_build_int64;
typedef __haiku_build_haiku_uint64 _haiku_build_uint64;
/* shorthand types */
-typedef volatile _haiku_build_int8 _haiku_build_vint8;
+typedef volatile _haiku_build_int8 _haiku_build_vint8;
typedef volatile _haiku_build_uint8 _haiku_build_vuint8;
typedef volatile _haiku_build_int16 _haiku_build_vint16;
typedef volatile _haiku_build_uint16 _haiku_build_vuint16;
@@ -39,18 +39,18 @@ typedef volatile _haiku_build_uint32
_haiku_build_vuint32;
typedef volatile _haiku_build_int64 _haiku_build_vint64;
typedef volatile _haiku_build_uint64 _haiku_build_vuint64;
-typedef volatile long _haiku_build_vlong;
-typedef volatile int _haiku_build_vint;
-typedef volatile short _haiku_build_vshort;
-typedef volatile char _haiku_build_vchar;
+typedef volatile long
_haiku_build_vlong;
+typedef volatile int
_haiku_build_vint;
+typedef volatile short
_haiku_build_vshort;
+typedef volatile char
_haiku_build_vchar;
-typedef volatile unsigned long _haiku_build_vulong;
-typedef volatile unsigned int _haiku_build_vuint;
-typedef volatile unsigned short _haiku_build_vushort;
-typedef volatile unsigned char _haiku_build_vuchar;
+typedef volatile unsigned long _haiku_build_vulong;
+typedef volatile unsigned int _haiku_build_vuint;
+typedef volatile unsigned short
_haiku_build_vushort;
+typedef volatile unsigned char _haiku_build_vuchar;
-typedef unsigned char _haiku_build_uchar;
-typedef unsigned short _haiku_build_unichar;
+typedef unsigned char
_haiku_build_uchar;
+typedef unsigned short
_haiku_build_unichar;
/* descriptive types */
typedef _haiku_build_int32
_HAIKU_BUILD_IDENTIFIER(status_t);
@@ -67,51 +67,51 @@ typedef _haiku_build_generic_addr_t
_HAIKU_BUILD_IDENTIFIER(generic_size_t);
/* printf()/scanf() format strings for [u]int* types */
-#define _HAIKU_BUILD_B_PRId8 "d"
-#define _HAIKU_BUILD_B_PRIi8 "i"
-#define _HAIKU_BUILD_B_PRId16 "d"
-#define _HAIKU_BUILD_B_PRIi16 "i"
-#define _HAIKU_BUILD_B_PRId32 __HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "d"
-#define _HAIKU_BUILD_B_PRIi32 __HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "i"
-#define _HAIKU_BUILD_B_PRId64 __HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "d"
-#define _HAIKU_BUILD_B_PRIi64 __HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "i"
-#define _HAIKU_BUILD_B_PRIu8 "u"
-#define _HAIKU_BUILD_B_PRIo8 "o"
-#define _HAIKU_BUILD_B_PRIx8 "x"
-#define _HAIKU_BUILD_B_PRIX8 "X"
-#define _HAIKU_BUILD_B_PRIu16 "u"
-#define _HAIKU_BUILD_B_PRIo16 "o"
-#define _HAIKU_BUILD_B_PRIx16 "x"
-#define _HAIKU_BUILD_B_PRIX16 "X"
-#define _HAIKU_BUILD_B_PRIu32 __HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "u"
-#define _HAIKU_BUILD_B_PRIo32 __HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "o"
-#define _HAIKU_BUILD_B_PRIx32 __HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "x"
-#define _HAIKU_BUILD_B_PRIX32 __HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "X"
-#define _HAIKU_BUILD_B_PRIu64 __HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "u"
-#define _HAIKU_BUILD_B_PRIo64 __HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "o"
-#define _HAIKU_BUILD_B_PRIx64 __HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "x"
-#define _HAIKU_BUILD_B_PRIX64 __HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "X"
-
-#define _HAIKU_BUILD_B_SCNd8 "hhd"
-#define _HAIKU_BUILD_B_SCNi8 "hhi"
-#define _HAIKU_BUILD_B_SCNd16 "hd"
-#define _HAIKU_BUILD_B_SCNi16 "hi"
-#define _HAIKU_BUILD_B_SCNd32 __HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "d"
-#define _HAIKU_BUILD_B_SCNi32 __HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "i"
-#define _HAIKU_BUILD_B_SCNd64 __HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "d"
-#define _HAIKU_BUILD_B_SCNi64 __HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "i"
-#define _HAIKU_BUILD_B_SCNu8 "hhu"
-#define _HAIKU_BUILD_B_SCNo8 "hho"
-#define _HAIKU_BUILD_B_SCNx8 "hhx"
-#define _HAIKU_BUILD_B_SCNu16 "hu"
-#define _HAIKU_BUILD_B_SCNo16 "ho"
-#define _HAIKU_BUILD_B_SCNx16 "hx"
-#define _HAIKU_BUILD_B_SCNu32 __HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "u"
-#define _HAIKU_BUILD_B_SCNo32 __HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "o"
-#define _HAIKU_BUILD_B_SCNx32 __HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "x"
-#define _HAIKU_BUILD_B_SCNu64 __HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "u"
-#define _HAIKU_BUILD_B_SCNo64 __HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "o"
-#define _HAIKU_BUILD_B_SCNx64 __HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "x"
+#define _HAIKU_BUILD_B_PRId8 "d"
+#define _HAIKU_BUILD_B_PRIi8 "i"
+#define _HAIKU_BUILD_B_PRId16 "d"
+#define _HAIKU_BUILD_B_PRIi16 "i"
+#define _HAIKU_BUILD_B_PRId32
__HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "d"
+#define _HAIKU_BUILD_B_PRIi32
__HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "i"
+#define _HAIKU_BUILD_B_PRId64
__HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "d"
+#define _HAIKU_BUILD_B_PRIi64
__HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "i"
+#define _HAIKU_BUILD_B_PRIu8 "u"
+#define _HAIKU_BUILD_B_PRIo8 "o"
+#define _HAIKU_BUILD_B_PRIx8 "x"
+#define _HAIKU_BUILD_B_PRIX8 "X"
+#define _HAIKU_BUILD_B_PRIu16 "u"
+#define _HAIKU_BUILD_B_PRIo16 "o"
+#define _HAIKU_BUILD_B_PRIx16 "x"
+#define _HAIKU_BUILD_B_PRIX16 "X"
+#define _HAIKU_BUILD_B_PRIu32
__HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "u"
+#define _HAIKU_BUILD_B_PRIo32
__HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "o"
+#define _HAIKU_BUILD_B_PRIx32
__HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "x"
+#define _HAIKU_BUILD_B_PRIX32
__HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "X"
+#define _HAIKU_BUILD_B_PRIu64
__HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "u"
+#define _HAIKU_BUILD_B_PRIo64
__HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "o"
+#define _HAIKU_BUILD_B_PRIx64
__HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "x"
+#define _HAIKU_BUILD_B_PRIX64
__HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "X"
+
+#define _HAIKU_BUILD_B_SCNd8 "hhd"
+#define _HAIKU_BUILD_B_SCNi8 "hhi"
+#define _HAIKU_BUILD_B_SCNd16 "hd"
+#define _HAIKU_BUILD_B_SCNi16 "hi"
+#define _HAIKU_BUILD_B_SCNd32
__HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "d"
+#define _HAIKU_BUILD_B_SCNi32
__HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "i"
+#define _HAIKU_BUILD_B_SCNd64
__HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "d"
+#define _HAIKU_BUILD_B_SCNi64
__HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "i"
+#define _HAIKU_BUILD_B_SCNu8 "hhu"
+#define _HAIKU_BUILD_B_SCNo8 "hho"
+#define _HAIKU_BUILD_B_SCNx8 "hhx"
+#define _HAIKU_BUILD_B_SCNu16 "hu"
+#define _HAIKU_BUILD_B_SCNo16 "ho"
+#define _HAIKU_BUILD_B_SCNx16 "hx"
+#define _HAIKU_BUILD_B_SCNu32
__HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "u"
+#define _HAIKU_BUILD_B_SCNo32
__HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "o"
+#define _HAIKU_BUILD_B_SCNx32
__HAIKU_BUILD_HAIKU_PRI_PREFIX_32 "x"
+#define _HAIKU_BUILD_B_SCNu64
__HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "u"
+#define _HAIKU_BUILD_B_SCNo64
__HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "o"
+#define _HAIKU_BUILD_B_SCNx64
__HAIKU_BUILD_HAIKU_PRI_PREFIX_64 "x"
/* printf() format strings for some standard types */
/* size_t */
@@ -157,7 +157,7 @@ typedef _haiku_build_generic_addr_t
_HAIKU_BUILD_IDENTIFIER(generic_size_t);
/* Empty string ("") */
#ifdef __cplusplus
-_HAIKU_BUILD_DECLARE_CONSTANT(const char*, B_EMPTY_STRING)
+ _HAIKU_BUILD_DECLARE_CONSTANT(const char*, B_EMPTY_STRING)
#endif
@@ -241,17 +241,17 @@ _HAIKU_BUILD_DECLARE_FUNCTION(void*,
_haiku_build_get_stack_frame, (void))
#ifndef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER
// NOTE: #8730 -- Are the next several groupings correct?
/* fixed-size integer types */
- typedef _haiku_build_int8 int8;
- typedef _haiku_build_uint8 uint8;
- typedef _haiku_build_int16 int16;
- typedef _haiku_build_uint16 uint16;
- typedef _haiku_build_int32 int32;
- typedef _haiku_build_uint32 uint32;
- typedef _haiku_build_int64 int64;
- typedef _haiku_build_uint64 uint64;
+ typedef _haiku_build_int8 int8;
+ typedef _haiku_build_uint8 uint8;
+ typedef _haiku_build_int16 int16;
+ typedef _haiku_build_uint16 uint16;
+ typedef _haiku_build_int32 int32;
+ typedef _haiku_build_uint32 uint32;
+ typedef _haiku_build_int64 int64;
+ typedef _haiku_build_uint64 uint64;
/* shorthand types */
- typedef volatile _haiku_build_vint8 vint8;
+ typedef volatile _haiku_build_vint8 vint8;
typedef volatile _haiku_build_vuint8 vuint8;
typedef volatile _haiku_build_vint16 vint16;
typedef volatile _haiku_build_vuint16 vuint16;
@@ -261,11 +261,11 @@ _HAIKU_BUILD_DECLARE_FUNCTION(void*,
_haiku_build_get_stack_frame, (void))
typedef volatile _haiku_build_vuint64 vuint64;
/* descriptive types */
- typedef _haiku_build_int32 int32;
- typedef _haiku_build_int64 int64;
- typedef _haiku_build_int64 int64;
- typedef _haiku_build_uint32 uint32;
- typedef _haiku_build_uint32 uint32;
+ typedef _haiku_build_int32 int32;
+ typedef _haiku_build_int64 int64;
+ typedef _haiku_build_int64 int64;
+ typedef _haiku_build_uint32 uint32;
+ typedef _haiku_build_uint32 uint32;
typedef __haiku_build_haiku_phys_addr_t __haiku_phys_addr_t;
typedef _haiku_build_phys_addr_t phys_addr_t;
@@ -274,51 +274,51 @@ _HAIKU_BUILD_DECLARE_FUNCTION(void*,
_haiku_build_get_stack_frame, (void))
typedef _haiku_build_generic_addr_t generic_addr_t;
/* printf()/scanf() format strings for [u]int* types */
-# define B_PRId8 _HAIKU_BUILD_B_PRId8
-# define B_PRIi8 _HAIKU_BUILD_B_PRIi8
-# define B_PRId16 _HAIKU_BUILD_B_PRId16
-# define B_PRIi16 _HAIKU_BUILD_B_PRIi16
-# define B_PRId32 _HAIKU_BUILD_B_PRId32
-# define B_PRIi32 _HAIKU_BUILD_B_PRId64
-# define B_PRId64 _HAIKU_BUILD_B_PRId64
-# define B_PRIi64 _HAIKU_BUILD_B_PRIi64
-# define B_PRIu8 _HAIKU_BUILD_B_PRIu8
-# define B_PRIo8 _HAIKU_BUILD_B_PRIo8
-# define B_PRIx8 _HAIKU_BUILD_B_PRIx8
-# define B_PRIX8 _HAIKU_BUILD_B_PRIX8
-# define B_PRIu16 _HAIKU_BUILD_B_PRIu16
-# define B_PRIo16 _HAIKU_BUILD_B_PRIo16
-# define B_PRIx16 _HAIKU_BUILD_B_PRIx16
-# define B_PRIX16 _HAIKU_BUILD_B_PRIX16
-# define B_PRIu32 _HAIKU_BUILD_B_PRIu32
-# define B_PRIo32 _HAIKU_BUILD_B_PRIo32
-# define B_PRIx32 _HAIKU_BUILD_B_PRIx32
-# define B_PRIX32 _HAIKU_BUILD_B_PRIX32
-# define B_PRIu64 _HAIKU_BUILD_B_PRIu64
-# define B_PRIo64 _HAIKU_BUILD_B_PRIo64
-# define B_PRIx64 _HAIKU_BUILD_B_PRIx64
-# define B_PRIX64 _HAIKU_BUILD_B_PRIX64
-
-# define B_SCNd8 _HAIKU_BUILD_B_SCNd8
-# define B_SCNi8 _HAIKU_BUILD_B_SCNi8
-# define B_SCNd16 _HAIKU_BUILD_B_SCNd16
-# define B_SCNi16 _HAIKU_BUILD_B_SCNi16
-# define B_SCNd32 _HAIKU_BUILD_B_SCNd32
-# define B_SCNi32 _HAIKU_BUILD_B_SCNi32
-# define B_SCNd64 _HAIKU_BUILD_B_SCNd64
-# define B_SCNi64 _HAIKU_BUILD_B_SCNi64
-# define B_SCNu8 _HAIKU_BUILD_B_SCNu8
-# define B_SCNo8 _HAIKU_BUILD_B_SCNo8
-# define B_SCNx8 _HAIKU_BUILD_B_SCNx8
-# define B_SCNu16 _HAIKU_BUILD_B_SCNu16
-# define B_SCNo16 _HAIKU_BUILD_B_SCNo16
-# define B_SCNx16 _HAIKU_BUILD_B_SCNx16
-# define B_SCNu32 _HAIKU_BUILD_B_SCNu32
-# define B_SCNo32 _HAIKU_BUILD_B_SCNo32
-# define B_SCNx32 _HAIKU_BUILD_B_SCNx32
-# define B_SCNu64 _HAIKU_BUILD_B_SCNu64
-# define B_SCNo64 _HAIKU_BUILD_B_SCNo64
-# define B_SCNx64 _HAIKU_BUILD_B_SCNx64
+# define B_PRId8 _HAIKU_BUILD_B_PRId8
+# define B_PRIi8 _HAIKU_BUILD_B_PRIi8
+# define B_PRId16 _HAIKU_BUILD_B_PRId16
+# define B_PRIi16 _HAIKU_BUILD_B_PRIi16
+# define B_PRId32 _HAIKU_BUILD_B_PRId32
+# define B_PRIi32 _HAIKU_BUILD_B_PRId64
+# define B_PRId64 _HAIKU_BUILD_B_PRId64
+# define B_PRIi64 _HAIKU_BUILD_B_PRIi64
+# define B_PRIu8 _HAIKU_BUILD_B_PRIu8
+# define B_PRIo8 _HAIKU_BUILD_B_PRIo8
+# define B_PRIx8 _HAIKU_BUILD_B_PRIx8
+# define B_PRIX8 _HAIKU_BUILD_B_PRIX8
+# define B_PRIu16 _HAIKU_BUILD_B_PRIu16
+# define B_PRIo16 _HAIKU_BUILD_B_PRIo16
+# define B_PRIx16 _HAIKU_BUILD_B_PRIx16
+# define B_PRIX16 _HAIKU_BUILD_B_PRIX16
+# define B_PRIu32 _HAIKU_BUILD_B_PRIu32
+# define B_PRIo32 _HAIKU_BUILD_B_PRIo32
+# define B_PRIx32 _HAIKU_BUILD_B_PRIx32
+# define B_PRIX32 _HAIKU_BUILD_B_PRIX32
+# define B_PRIu64 _HAIKU_BUILD_B_PRIu64
+# define B_PRIo64 _HAIKU_BUILD_B_PRIo64
+# define B_PRIx64 _HAIKU_BUILD_B_PRIx64
+# define B_PRIX64 _HAIKU_BUILD_B_PRIX64
+
+# define B_SCNd8 _HAIKU_BUILD_B_SCNd8
+# define B_SCNi8 _HAIKU_BUILD_B_SCNi8
+# define B_SCNd16 _HAIKU_BUILD_B_SCNd16
+# define B_SCNi16 _HAIKU_BUILD_B_SCNi16
+# define B_SCNd32 _HAIKU_BUILD_B_SCNd32
+# define B_SCNi32 _HAIKU_BUILD_B_SCNi32
+# define B_SCNd64 _HAIKU_BUILD_B_SCNd64
+# define B_SCNi64 _HAIKU_BUILD_B_SCNi64
+# define B_SCNu8 _HAIKU_BUILD_B_SCNu8
+# define B_SCNo8 _HAIKU_BUILD_B_SCNo8
+# define B_SCNx8 _HAIKU_BUILD_B_SCNx8
+# define B_SCNu16 _HAIKU_BUILD_B_SCNu16
+# define B_SCNo16 _HAIKU_BUILD_B_SCNo16
+# define B_SCNx16 _HAIKU_BUILD_B_SCNx16
+# define B_SCNu32 _HAIKU_BUILD_B_SCNu32
+# define B_SCNo32 _HAIKU_BUILD_B_SCNo32
+# define B_SCNx32 _HAIKU_BUILD_B_SCNx32
+# define B_SCNu64 _HAIKU_BUILD_B_SCNu64
+# define B_SCNo64 _HAIKU_BUILD_B_SCNo64
+# define B_SCNx64 _HAIKU_BUILD_B_SCNx64
/* printf() format strings for some standard types */
/* size_t */
############################################################################
Commit: 2651185ca796770e9895a339134bd98c4f117d78
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sun Aug 5 12:03:44 2012 UTC
Made corrections to typedefs. Review appreciated.
----------------------------------------------------------------------------
diff --git a/headers/build/os_target/support/target_SupportDefs.h
b/headers/build/os_target/support/target_SupportDefs.h
index 61adec9..fb1b948 100644
--- a/headers/build/os_target/support/target_SupportDefs.h
+++ b/headers/build/os_target/support/target_SupportDefs.h
@@ -53,17 +53,17 @@ typedef unsigned char
_haiku_build_uchar;
typedef unsigned short
_haiku_build_unichar;
/* descriptive types */
-typedef _haiku_build_int32
_HAIKU_BUILD_IDENTIFIER(status_t);
-typedef _haiku_build_int64
_HAIKU_BUILD_IDENTIFIER(bigtime_t);
-typedef _haiku_build_int64
_HAIKU_BUILD_IDENTIFIER(nanotime_t);
-typedef _haiku_build_uint32
_HAIKU_BUILD_IDENTIFIER(type_code);
-typedef _haiku_build_uint32
_HAIKU_BUILD_IDENTIFIER(perform_code);
+typedef _haiku_build_int32
_haiku_build_status_t;
+typedef _haiku_build_int64
_haiku_build_bigtime_t;
+typedef _haiku_build_int64
_haiku_build_nanotime_t;
+typedef _haiku_build_uint32
_haiku_build_type_code;
+typedef _haiku_build_uint32
_haiku_build_perform_code;
-typedef __haiku_build_haiku_phys_addr_t
_HAIKU_BUILD_IDENTIFIER(phys_addr_t);
-typedef _haiku_build_phys_addr_t
_HAIKU_BUILD_IDENTIFIER(phys_size_t);
+typedef __haiku_build_haiku_phys_addr_t
_haiku_build_phys_addr_t;
+typedef _haiku_build_phys_addr_t
_haiku_build_phys_size_t;
-typedef __haiku_build_haiku_generic_addr_t
_HAIKU_BUILD_IDENTIFIER(generic_addr_t);
-typedef _haiku_build_generic_addr_t
_HAIKU_BUILD_IDENTIFIER(generic_size_t);
+typedef __haiku_build_haiku_generic_addr_t _haiku_build_generic_addr_t;
+typedef _haiku_build_generic_addr_t
_haiku_build_generic_size_t;
/* printf()/scanf() format strings for [u]int* types */
@@ -239,7 +239,6 @@ _HAIKU_BUILD_DECLARE_FUNCTION(void*,
_haiku_build_get_stack_frame, (void))
#endif
#ifndef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER
-// NOTE: #8730 -- Are the next several groupings correct?
/* fixed-size integer types */
typedef _haiku_build_int8 int8;
typedef _haiku_build_uint8 uint8;
@@ -260,18 +259,33 @@ _HAIKU_BUILD_DECLARE_FUNCTION(void*,
_haiku_build_get_stack_frame, (void))
typedef volatile _haiku_build_vint64 vint64;
typedef volatile _haiku_build_vuint64 vuint64;
+/* NOTE: #8730 Just to make sure, are these not needed?
+ Are the libroot versions correct?
*/
+// typedef volatile _haiku_build_vlong vlong;
+// typedef volatile _haiku_build_vint vint;
+// typedef volatile _haiku_build_vshort vshort;
+// typedef volatile _haiku_build_vchar vchar;
+//
+// typedef volatile unsigned _haiku_build_vulong vulong;
+// typedef volatile unsigned _haiku_build_vuint vuint;
+// typedef volatile unsigned _haiku_build_vushort vushort;
+// typedef volatile unsigned _haiku_build_vuchar vuchar;
+//
+// typedef unsigned _haiku_build_uchar uchar;
+// typedef unsigned _haiku_build_unichar unichar;
+
/* descriptive types */
- typedef _haiku_build_int32 int32;
- typedef _haiku_build_int64 int64;
- typedef _haiku_build_int64 int64;
- typedef _haiku_build_uint32 uint32;
- typedef _haiku_build_uint32 uint32;
+ typedef _haiku_build_status_t status_t;
+ typedef _haiku_build_bigtime_t bigtime_t;
+ typedef _haiku_build_nanotime_t nanotime_t;
+ typedef _haiku_build_type_code type_code;
+ typedef _haiku_build_perform_code perform_code;
- typedef __haiku_build_haiku_phys_addr_t __haiku_phys_addr_t;
typedef _haiku_build_phys_addr_t phys_addr_t;
+ typedef _haiku_build_phys_size_t phys_size_t;
- typedef __haiku_build_haiku_generic_addr_t __haiku_generic_addr_t;
- typedef _haiku_build_generic_addr_t generic_addr_t;
+ typedef _haiku_build_generic_addr_t generic_addr_t;
+ typedef _haiku_build_generic_size_t generic_size_t;
/* printf()/scanf() format strings for [u]int* types */
# define B_PRId8 _HAIKU_BUILD_B_PRId8
############################################################################
Commit: b5ba2b149da91e4241c5f9a8d5e7f6d33f844dbd
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sun Aug 5 12:29:41 2012 UTC
Whitespace cleanup. No functional change.
----------------------------------------------------------------------------
diff --git a/headers/build/config_target/target_HaikuConfig.h
b/headers/build/config_target/target_HaikuConfig.h
index 1435868..ad782e8 100644
--- a/headers/build/config_target/target_HaikuConfig.h
+++ b/headers/build/config_target/target_HaikuConfig.h
@@ -18,26 +18,26 @@
(defaults to
undefined)
*/
#ifdef __INTEL__
-# define __HAIKU_BUILD_HAIKU_ARCH x86
-# define __HAIKU_BUILD_HAIKU_ARCH_X86 1
+# define __HAIKU_BUILD_HAIKU_ARCH
x86
+# define __HAIKU_BUILD_HAIKU_ARCH_X86
1
#elif __x86_64__
-# define __HAIKU_BUILD_HAIKU_ARCH x86_64
-# define __HAIKU_BUILD_HAIKU_ARCH_X86_64 1
-# define __HAIKU_BUILD_HAIKU_ARCH_BITS 64
+# define __HAIKU_BUILD_HAIKU_ARCH
x86_64
+# define __HAIKU_BUILD_HAIKU_ARCH_X86_64 1
+# define __HAIKU_BUILD_HAIKU_ARCH_BITS 64
#elif __POWERPC__
-# define __HAIKU_BUILD_HAIKU_ARCH ppc
-# define __HAIKU_BUILD_HAIKU_ARCH_PPC 1
-# define __HAIKU_BUILD_HAIKU_BIG_ENDIAN 1
+# define __HAIKU_BUILD_HAIKU_ARCH
ppc
+# define __HAIKU_BUILD_HAIKU_ARCH_PPC
1
+# define __HAIKU_BUILD_HAIKU_BIG_ENDIAN 1
#elif __M68K__
-# define __HAIKU_BUILD_HAIKU_ARCH m68k
-# define __HAIKU_BUILD_HAIKU_ARCH_M68K 1
-# define __HAIKU_BUILD_HAIKU_BIG_ENDIAN 1
+# define __HAIKU_BUILD_HAIKU_ARCH
m68k
+# define __HAIKU_BUILD_HAIKU_ARCH_M68K 1
+# define __HAIKU_BUILD_HAIKU_BIG_ENDIAN 1
#elif __MIPSEL__
-# define __HAIKU_BUILD_HAIKU_ARCH mipsel
-# define __HAIKU_BUILD_HAIKU_ARCH_MIPSEL 1
+# define __HAIKU_BUILD_HAIKU_ARCH
mipsel
+# define __HAIKU_BUILD_HAIKU_ARCH_MIPSEL 1
#elif __ARM__
-# define __HAIKU_BUILD_HAIKU_ARCH arm
-# define __HAIKU_BUILD_HAIKU_ARCH_ARM 1
+# define __HAIKU_BUILD_HAIKU_ARCH
arm
+# define __HAIKU_BUILD_HAIKU_ARCH_ARM
1
#else
# error Unsupported architecture!
#endif
@@ -54,33 +54,34 @@
/* bitness */
#ifndef __HAIKU_BUILD_HAIKU_ARCH_BITS
-# define __HAIKU_BUILD_HAIKU_ARCH_BITS 32
+# define __HAIKU_BUILD_HAIKU_ARCH_BITS 32
#endif
#if __HAIKU_BUILD_HAIKU_ARCH_BITS == 32
-# define __HAIKU_BUILD_HAIKU_ARCH_32_BIT 1
+# define __HAIKU_BUILD_HAIKU_ARCH_32_BIT 1
#elif __HAIKU_BUILD_HAIKU_ARCH_BITS == 64
-# define __HAIKU_BUILD_HAIKU_ARCH_64_BIT 1
+# define __HAIKU_BUILD_HAIKU_ARCH_64_BIT 1
#else
# error Unsupported bitness!
#endif
/* physical bitness */
#ifndef __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_BITS
-# define __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_BITS
__HAIKU_BUILD_HAIKU_ARCH_BITS
+# define __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_BITS \
+ __HAIKU_BUILD_HAIKU_ARCH_BITS
#endif
#if __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_BITS == 32
-# define __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_32_BIT 1
+# define __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_32_BIT 1
#elif __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_BITS == 64
-# define __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_64_BIT 1
+# define __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_64_BIT 1
#else
# error Unsupported physical bitness!
#endif
/* endianess */
#ifndef __HAIKU_BUILD_HAIKU_BIG_ENDIAN
-# define __HAIKU_BUILD_HAIKU_LITTLE_ENDIAN 1
+# define __HAIKU_BUILD_HAIKU_LITTLE_ENDIAN 1
#endif
/* architecture specific include macros */
@@ -94,7 +95,8 @@
# define __HAIKU_ARCH
__HAIKU_BUILD_HAIKU_ARCH
# define __HAIKU_ARCH_BITS
__HAIKU_BUILD_HAIKU_ARCH_BITS
-# define __HAIKU_ARCH_PHYSICAL_BITS
__HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_BITS
+# define __HAIKU_ARCH_PHYSICAL_BITS \
+ __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_BITS
# ifdef __HAIKU_BUILD_HAIKU_ARCH_X86
# define __HAIKU_ARCH_X86
__HAIKU_BUILD_HAIKU_ARCH_X86
@@ -129,15 +131,18 @@
# endif
# ifdef __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_32_BIT
-# define __HAIKU_ARCH_PHYSICAL_32_BIT
__HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_32_BIT
+# define __HAIKU_ARCH_PHYSICAL_32_BIT \
+ __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_32_BIT
# endif
# ifdef __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_64_BIT
-# define __HAIKU_ARCH_PHYSICAL_64_BIT
__HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_64_BIT
+# define __HAIKU_ARCH_PHYSICAL_64_BIT \
+ __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_64_BIT
# endif
# ifdef __HAIKU_BUILD_HAIKU_ARCH_LITTLE_ENDIAN
-# define __HAIKU_ARCH_LITTLE_ENDIAN
__HAIKU_BUILD_HAIKU_ARCH_LITTLE_ENDIAN
+# define __HAIKU_ARCH_LITTLE_ENDIAN \
+ __HAIKU_BUILD_HAIKU_ARCH_LITTLE_ENDIAN
# endif
# ifdef __HAIKU_BUILD_HAIKU_ARCH_BIG_ENDIAN
Other related posts:
- » [haiku-commits] BRANCH mmadia-github.separate-build-environment - in headers/build: os_target/support config_target - mmadia-github . separate-build-environment
