[haiku-commits] BRANCH mmadia-github.separate-build-environment - headers/build/config_target
- From: mmadia-github.separate-build-environment <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 5 Aug 2012 15:49:21 +0200 (CEST)
added 2 changesets to branch
'refs/remotes/mmadia-github/separate-build-environment'
old head: 6bdb75c759be19678c57f298d7a4c7085e1e351f
new head: b26d178f0952890f82e4e514063afbb03f32da80
----------------------------------------------------------------------------
e333782: Whitespace cleanup. No functional change.
b26d178: Omit the entire conditional definitions.
[ Matt Madia <mattmadia@xxxxxxxxx> ]
----------------------------------------------------------------------------
1 file changed, 27 insertions(+), 54 deletions(-)
headers/build/config_target/target_types.h | 81 ++++++++----------------
############################################################################
Commit: e333782ce39a5b3f46127788c5db31ba47982864
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sun Aug 5 08:53:32 2012 UTC
Whitespace cleanup. No functional change.
----------------------------------------------------------------------------
diff --git a/headers/build/config_target/target_types.h
b/headers/build/config_target/target_types.h
index 38f4635..e3cfbe4 100644
--- a/headers/build/config_target/target_types.h
+++ b/headers/build/config_target/target_types.h
@@ -16,39 +16,39 @@
__HAIKU_BEOS_COMPATIBLE_TYPES is not defined both sets are identical. Once
we drop compatibility for good, we can consolidate the types.
*/
-typedef _HAIKU_BUILD_FEATURE_int8 __haiku_build_haiku_std_int8;
-typedef _HAIKU_BUILD_FEATURE_uint8 __haiku_build_haiku_std_uint8;
-typedef _HAIKU_BUILD_FEATURE_int16 __haiku_build_haiku_std_int16;
-typedef _HAIKU_BUILD_FEATURE_uint16 __haiku_build_haiku_std_uint16;
-typedef _HAIKU_BUILD_FEATURE_int32 __haiku_build_haiku_std_int32;
-typedef _HAIKU_BUILD_FEATURE_uint32 __haiku_build_haiku_std_uint32;
-typedef _HAIKU_BUILD_FEATURE_int64 __haiku_build_haiku_std_int64;
-typedef _HAIKU_BUILD_FEATURE_uint64 __haiku_build_haiku_std_uint64;
-
-typedef __haiku_build_haiku_std_int8 __haiku_build_haiku_int8;
-typedef __haiku_build_haiku_std_uint8 __haiku_build_haiku_uint8;
-typedef __haiku_build_haiku_std_int16 __haiku_build_haiku_int16;
-typedef __haiku_build_haiku_std_uint16 __haiku_build_haiku_uint16;
-typedef __haiku_build_haiku_std_int32 __haiku_build_haiku_int32;
-typedef __haiku_build_haiku_std_uint32 __haiku_build_haiku_uint32;
-typedef __haiku_build_haiku_std_int64 __haiku_build_haiku_int64;
-typedef __haiku_build_haiku_std_uint64 __haiku_build_haiku_uint64;
+typedef _HAIKU_BUILD_FEATURE_int8
__haiku_build_haiku_std_int8;
+typedef _HAIKU_BUILD_FEATURE_uint8
__haiku_build_haiku_std_uint8;
+typedef _HAIKU_BUILD_FEATURE_int16
__haiku_build_haiku_std_int16;
+typedef _HAIKU_BUILD_FEATURE_uint16
__haiku_build_haiku_std_uint16;
+typedef _HAIKU_BUILD_FEATURE_int32
__haiku_build_haiku_std_int32;
+typedef _HAIKU_BUILD_FEATURE_uint32
__haiku_build_haiku_std_uint32;
+typedef _HAIKU_BUILD_FEATURE_int64
__haiku_build_haiku_std_int64;
+typedef _HAIKU_BUILD_FEATURE_uint64
__haiku_build_haiku_std_uint64;
+
+typedef __haiku_build_haiku_std_int8 __haiku_build_haiku_int8;
+typedef __haiku_build_haiku_std_uint8 __haiku_build_haiku_uint8;
+typedef __haiku_build_haiku_std_int16 __haiku_build_haiku_int16;
+typedef __haiku_build_haiku_std_uint16 __haiku_build_haiku_uint16;
+typedef __haiku_build_haiku_std_int32 __haiku_build_haiku_int32;
+typedef __haiku_build_haiku_std_uint32 __haiku_build_haiku_uint32;
+typedef __haiku_build_haiku_std_int64 __haiku_build_haiku_int64;
+typedef __haiku_build_haiku_std_uint64 __haiku_build_haiku_uint64;
/* address types */
#ifdef __HAIKU_BUILD_HAIKU_ARCH_64_BIT
- typedef __haiku_build_haiku_int64 __haiku_build_haiku_saddr_t;
- typedef __haiku_build_haiku_uint64 __haiku_build_haiku_addr_t;
+ typedef __haiku_build_haiku_int64
__haiku_build_haiku_saddr_t;
+ typedef __haiku_build_haiku_uint64
__haiku_build_haiku_addr_t;
#else
- typedef __haiku_build_haiku_int32 __haiku_build_haiku_saddr_t;
- typedef __haiku_build_haiku_uint32 __haiku_build_haiku_addr_t;
+ typedef __haiku_build_haiku_int32
__haiku_build_haiku_saddr_t;
+ typedef __haiku_build_haiku_uint32
__haiku_build_haiku_addr_t;
#endif
#ifdef __HAIKU_BUILD_HAIKU_ARCH_PHYSICAL_64_BIT
- typedef __haiku_build_haiku_int64
__haiku_build_haiku_phys_saddr_t;
- typedef __haiku_build_haiku_uint64 __haiku_build_haiku_phys_addr_t;
+ typedef __haiku_build_haiku_int64
__haiku_build_haiku_phys_saddr_t;
+ typedef __haiku_build_haiku_uint64
__haiku_build_haiku_phys_addr_t;
#else
- typedef __haiku_build_haiku_int32
__haiku_build_haiku_phys_saddr_t;
- typedef __haiku_build_haiku_uint32 __haiku_build_haiku_phys_addr_t;
+ typedef __haiku_build_haiku_int32
__haiku_build_haiku_phys_saddr_t;
+ typedef __haiku_build_haiku_uint32
__haiku_build_haiku_phys_addr_t;
#endif
/* address type limits */
@@ -107,7 +107,8 @@ typedef __haiku_build_haiku_std_uint64
__haiku_build_haiku_uint64;
# define __HAIKU_BUILD_HAIKU_PRI_PREFIX_GENERIC_ADDR \
__HAIKU_BUILD_HAIKU_PRI_PREFIX_ADDR
#else
- typedef __haiku_build_haiku_phys_addr_t
__haiku_build_haiku_generic_addr_t;
+ typedef __haiku_build_haiku_phys_addr_t \
+ __haiku_build_haiku_generic_addr_t;
# define __HAIKU_BUILD_HAIKU_GENERIC_ADDR_MAX \
__HAIKU_BUILD_HAIKU_PHYS_ADDR_MAX
# define __HAIKU_BUILD_HAIKU_PRI_PREFIX_GENERIC_ADDR \
@@ -119,24 +120,25 @@ typedef __haiku_build_haiku_std_uint64
__haiku_build_haiku_uint64;
#ifndef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER
-#define __HAIKU_SADDR_MAX __HAIKU_BUILD_HAIKU_SADDR_MAX
-#define __HAIKU_ADDR_MAX __HAIKU_BUILD_HAIKU_ADDR_MAX
-#define __HAIKU_SADDR_MIN __HAIKU_BUILD_HAIKU_SADDR_MIN
+#define __HAIKU_SADDR_MAX
__HAIKU_BUILD_HAIKU_SADDR_MAX
+#define __HAIKU_ADDR_MAX
__HAIKU_BUILD_HAIKU_ADDR_MAX
+#define __HAIKU_SADDR_MIN
__HAIKU_BUILD_HAIKU_SADDR_MIN
-#define __HAIKU_PHYS_SADDR_MAX __HAIKU_BUILD_HAIKU_PHYS_SADDR_MAX
-#define __HAIKU_PHYS_ADDR_MAX __HAIKU_BUILD_HAIKU_PHYS_ADDR_MAX
-#define __HAIKU_PHYS_SADDR_MIN __HAIKU_BUILD_HAIKU_PHYS_SADDR_MIN
+#define __HAIKU_PHYS_SADDR_MAX
__HAIKU_BUILD_HAIKU_PHYS_SADDR_MAX
+#define __HAIKU_PHYS_ADDR_MAX
__HAIKU_BUILD_HAIKU_PHYS_ADDR_MAX
+#define __HAIKU_PHYS_SADDR_MIN
__HAIKU_BUILD_HAIKU_PHYS_SADDR_MIN
-#define __HAIKU_STD_PRI_PREFIX_32
__HAIKU_BUILD_HAIKU_STD_PRI_PREFIX_32
-#define __HAIKU_STD_PRI_PREFIX_64 __HAIKU_BUILD_HAIKU_STD_PRI_PREFIX_64
+#define __HAIKU_STD_PRI_PREFIX_32
__HAIKU_BUILD_HAIKU_STD_PRI_PREFIX_32
+#define __HAIKU_STD_PRI_PREFIX_64
__HAIKU_BUILD_HAIKU_STD_PRI_PREFIX_64
-#define __HAIKU_PRI_PREFIX_32 __HAIKU_BUILD_HAIKU_PRI_PREFIX_32
-#define __HAIKU_PRI_PREFIX_64 __HAIKU_BUILD_HAIKU_PRI_PREFIX_64
+#define __HAIKU_PRI_PREFIX_32
__HAIKU_BUILD_HAIKU_PRI_PREFIX_32
+#define __HAIKU_PRI_PREFIX_64
__HAIKU_BUILD_HAIKU_PRI_PREFIX_64
#define __HAIKU_PRI_PREFIX_ADDR
__HAIKU_BUILD_HAIKU_PRI_PREFIX_ADDR
-#define __HAIKU_PRI_PREFIX_PHYS_ADDR __HAIKU_BUILD_HAIKU_PRI_PREFIX_PHYS_ADDR
+#define __HAIKU_PRI_PREFIX_PHYS_ADDR \
+ __HAIKU_BUILD_HAIKU_PRI_PREFIX_PHYS_ADDR
-#define __HAIKU_GENERIC_ADDR_MAX __HAIKU_BUILD_HAIKU_GENERIC_ADDR_MAX
+#define __HAIKU_GENERIC_ADDR_MAX
__HAIKU_BUILD_HAIKU_GENERIC_ADDR_MAX
#define __HAIKU_PRI_PREFIX_GENERIC_ADDR \
__HAIKU_BUILD_HAIKU_PRI_PREFIX_GENERIC_ADDR
############################################################################
Commit: b26d178f0952890f82e4e514063afbb03f32da80
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sun Aug 5 09:06:30 2012 UTC
Omit the entire conditional definitions.
----------------------------------------------------------------------------
diff --git a/headers/build/config_target/target_types.h
b/headers/build/config_target/target_types.h
index e3cfbe4..1197114 100644
--- a/headers/build/config_target/target_types.h
+++ b/headers/build/config_target/target_types.h
@@ -115,33 +115,4 @@ typedef __haiku_build_haiku_std_uint64
__haiku_build_haiku_uint64;
__HAIKU_BUILD_HAIKU_PRI_PREFIX_PHYS_ADDR
#endif
-
-/* map the macros/types, if not building the libroot mapper functions */
-
-#ifndef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER
-
-#define __HAIKU_SADDR_MAX
__HAIKU_BUILD_HAIKU_SADDR_MAX
-#define __HAIKU_ADDR_MAX
__HAIKU_BUILD_HAIKU_ADDR_MAX
-#define __HAIKU_SADDR_MIN
__HAIKU_BUILD_HAIKU_SADDR_MIN
-
-#define __HAIKU_PHYS_SADDR_MAX
__HAIKU_BUILD_HAIKU_PHYS_SADDR_MAX
-#define __HAIKU_PHYS_ADDR_MAX
__HAIKU_BUILD_HAIKU_PHYS_ADDR_MAX
-#define __HAIKU_PHYS_SADDR_MIN
__HAIKU_BUILD_HAIKU_PHYS_SADDR_MIN
-
-#define __HAIKU_STD_PRI_PREFIX_32
__HAIKU_BUILD_HAIKU_STD_PRI_PREFIX_32
-#define __HAIKU_STD_PRI_PREFIX_64
__HAIKU_BUILD_HAIKU_STD_PRI_PREFIX_64
-
-#define __HAIKU_PRI_PREFIX_32
__HAIKU_BUILD_HAIKU_PRI_PREFIX_32
-#define __HAIKU_PRI_PREFIX_64
__HAIKU_BUILD_HAIKU_PRI_PREFIX_64
-
-#define __HAIKU_PRI_PREFIX_ADDR
__HAIKU_BUILD_HAIKU_PRI_PREFIX_ADDR
-#define __HAIKU_PRI_PREFIX_PHYS_ADDR \
- __HAIKU_BUILD_HAIKU_PRI_PREFIX_PHYS_ADDR
-
-#define __HAIKU_GENERIC_ADDR_MAX
__HAIKU_BUILD_HAIKU_GENERIC_ADDR_MAX
-#define __HAIKU_PRI_PREFIX_GENERIC_ADDR \
- __HAIKU_BUILD_HAIKU_PRI_PREFIX_GENERIC_ADDR
-
-#endif /* _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER */
-
#endif /* _CONFIG_BUILD_TYPES_H */
Other related posts:
