[haiku-commits] BRANCH mmadia-github.separate-build-environment - src/build/configure headers/build/posix_target
- From: mmadia-github.separate-build-environment <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 6 Aug 2012 05:49:13 +0200 (CEST)
added 4 changesets to branch
'refs/remotes/mmadia-github/separate-build-environment'
old head: 3043b4b98d422d1a33b3350c4470b88ec57afea4
new head: fbb0cb221a220038c8ecefa331c57ce106b85acd
----------------------------------------------------------------------------
782a472: Add stddef.h's definitions to HaikuHostBuildConfig.h
d57e173: No need to include <stddef.h> now.
0cddd02: Remove some unintentional macros from the test for limits.h
fbb0cb2: HaikuHostBuildConfig.h has size_t typedef'd with
_HAIKU_BUILD_FEATURE___SIZE_TYPE__
[ Matt Madia <mattmadia@xxxxxxxxx> ]
----------------------------------------------------------------------------
5 files changed, 76 insertions(+), 7 deletions(-)
headers/build/posix_target/target_size_t.h | 3 -
headers/build/posix_target/target_time.h | 5 +-
src/build/configure/Jamfile | 1 +
src/build/configure/test_limits_header.cpp | 2 -
src/build/configure/test_stddef_header.cpp | 72 ++++++++++++++++++++++++
############################################################################
Commit: 782a472687f5b11e4f2199b74d5173a0e8de3e40
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sun Aug 5 23:04:23 2012 UTC
Add stddef.h's definitions to HaikuHostBuildConfig.h
----------------------------------------------------------------------------
diff --git a/src/build/configure/Jamfile b/src/build/configure/Jamfile
index 53e1577..6cf8726 100644
--- a/src/build/configure/Jamfile
+++ b/src/build/configure/Jamfile
@@ -68,6 +68,7 @@ actions ConfigureRunProgram1
ConfigureRunProgram test_int_types : test_int_types.cpp : $(HOST_LIBSTDC++) ;
ConfigureRunProgram test_limits_header : test_limits_header.cpp :
$(HOST_LIBSTDC++) ;
ConfigureRunProgram test_float_header : test_float_header.cpp :
$(HOST_LIBSTDC++) ;
+ConfigureRunProgram test_stddef_header : test_stddef_header.cpp :
$(HOST_LIBSTDC++) ;
Depends configure_build : $(configureTargets) ;
diff --git a/src/build/configure/test_stddef_header.cpp
b/src/build/configure/test_stddef_header.cpp
new file mode 100644
index 0000000..315f837
--- /dev/null
+++ b/src/build/configure/test_stddef_header.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2012, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include <stddef.h>
+#include <stdio.h>
+
+
+#define TO_STRING(x) #x
+#define PRINT_MACRO(x) \
+ printf("#define _HAIKU_BUILD_FEATURE_" #x " %s\n", TO_STRING(x))
+
+
+int
+main()
+{
+ printf("/* stddef.h */\n");
+ PRINT_MACRO(___int_ptrdiff_t_h);
+ PRINT_MACRO(___int_size_t_h);
+ PRINT_MACRO(___int_wchar_t_h);
+ PRINT_MACRO(__INT_WCHAR_T_H);
+ PRINT_MACRO(__PTRDIFF_T);
+ PRINT_MACRO(__PTRDIFF_TYPE__);
+ PRINT_MACRO(__size_t__);
+ PRINT_MACRO(__SIZE_T__);
+ PRINT_MACRO(__size_t);
+ PRINT_MACRO(__SIZE_T);
+ PRINT_MACRO(__SIZE_TYPE__);
+ PRINT_MACRO(__wchar_t__);
+ PRINT_MACRO(__WCHAR_T__);
+ PRINT_MACRO(__WCHAR_T);
+ PRINT_MACRO(__WCHAR_TYPE__);
+ PRINT_MACRO(__WINT_TYPE__);
+ PRINT_MACRO(_BSD_PTRDIFF_T_);
+ PRINT_MACRO(_BSD_RUNE_T_DEFINED_);
+ PRINT_MACRO(_BSD_SIZE_T_);
+ PRINT_MACRO(_BSD_SIZE_T_DEFINED_);
+ PRINT_MACRO(_BSD_WCHAR_T_);
+ PRINT_MACRO(_BSD_WCHAR_T_DEFINED_);
+ PRINT_MACRO(_GCC_PTRDIFF_T);
+ PRINT_MACRO(_GCC_SIZE_T);
+ PRINT_MACRO(_GCC_WCHAR_T);
+ PRINT_MACRO(_PTRDIFF_T_);
+ PRINT_MACRO(_PTRDIFF_T);
+ PRINT_MACRO(_RUNE_T_DECLARED);
+ PRINT_MACRO(_SIZE_T_);
+ PRINT_MACRO(_SIZE_T_DECLARED);
+ PRINT_MACRO(_SIZE_T_DEFINED_);
+ PRINT_MACRO(_SIZE_T_DEFINED);
+ PRINT_MACRO(_SIZE_T);
+ PRINT_MACRO(_SIZET_);
+ PRINT_MACRO(_SYS_SIZE_T_H);
+ PRINT_MACRO(_T_PTRDIFF_);
+ PRINT_MACRO(_T_PTRDIFF);
+ PRINT_MACRO(_T_SIZE_);
+ PRINT_MACRO(_T_SIZE);
+ PRINT_MACRO(_T_WCHAR_);
+ PRINT_MACRO(_T_WCHAR);
+ PRINT_MACRO(_WCHAR_T_);
+ PRINT_MACRO(_WCHAR_T_DECLARED);
+ PRINT_MACRO(_WCHAR_T_DEFINED_);
+ PRINT_MACRO(_WCHAR_T_DEFINED);
+ PRINT_MACRO(_WCHAR_T_H);
+ PRINT_MACRO(_WCHAR_T);
+ PRINT_MACRO(_WINT_T);
+ PRINT_MACRO(NULL);
+ printf("\n");
+
+ return 0;
+}
############################################################################
Commit: d57e1730b4eb4232dd0496c94ae7a46c3d5ba9f9
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sun Aug 5 23:05:05 2012 UTC
No need to include <stddef.h> now.
----------------------------------------------------------------------------
diff --git a/headers/build/posix_target/target_size_t.h
b/headers/build/posix_target/target_size_t.h
index 75de5d6..9b0cb41 100644
--- a/headers/build/posix_target/target_size_t.h
+++ b/headers/build/posix_target/target_size_t.h
@@ -6,9 +6,6 @@
#define _SIZE_T_H_
-#include <stddef.h>
-
-
/* ATM we don't define ssize_t for GCC2 */
#if __GNUC__ > 2 && !defined(_HAIKU_BUILD_ssize_t__)
# define __HAIKU_BUILD_ssize_t__
############################################################################
Commit: 0cddd02a1bb768dd8633cda6f65e92d34674e354
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sun Aug 5 23:05:33 2012 UTC
Remove some unintentional macros from the test for limits.h
----------------------------------------------------------------------------
diff --git a/src/build/configure/test_limits_header.cpp
b/src/build/configure/test_limits_header.cpp
index 0a29a03..0bdf771 100644
--- a/src/build/configure/test_limits_header.cpp
+++ b/src/build/configure/test_limits_header.cpp
@@ -20,8 +20,6 @@ main()
PRINT_MACRO(__INT_MAX__);
PRINT_MACRO(__LONG_LONG_MAX__);
PRINT_MACRO(__LONG_MAX__);
- PRINT_MACRO(_LIMITS_H___);
- PRINT_MACRO(_MACH_MACHLIMITS_H_);
PRINT_MACRO(CHAR_BIT);
PRINT_MACRO(CHAR_MAX);
PRINT_MACRO(CHAR_MIN);
############################################################################
Commit: fbb0cb221a220038c8ecefa331c57ce106b85acd
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sun Aug 5 23:20:45 2012 UTC
HaikuHostBuildConfig.h has size_t typedef'd with
_HAIKU_BUILD_FEATURE___SIZE_TYPE__
----------------------------------------------------------------------------
diff --git a/headers/build/posix_target/target_time.h
b/headers/build/posix_target/target_time.h
index f3039c1..d4c40a2 100644
--- a/headers/build/posix_target/target_time.h
+++ b/headers/build/posix_target/target_time.h
@@ -97,8 +97,9 @@ _HAIKU_BUILD_DECLARE_FUNCTION(struct
_HAIKU_BUILD_IDENTIFIER(tm) *,
struct _HAIKU_BUILD_IDENTIFIER(tm) *tm))
_HAIKU_BUILD_DECLARE_FUNCTION(int, nanosleep, (const
_HAIKU_BUILD_IDENTIFIER(timespec) *, _HAIKU_BUILD_IDENTIFIER(timespec)
*))
-_HAIKU_BUILD_DECLARE_FUNCTION(size_t, strftime, (char *buffer, size_t maxSize,
- const char *format, const struct _HAIKU_BUILD_IDENTIFIER(tm) *tm))
+_HAIKU_BUILD_DECLARE_FUNCTION(_HAIKU_BUILD_FEATURE___SIZE_TYPE__, strftime,
+ (char *buffer, _HAIKU_BUILD_FEATURE___SIZE_TYPE__ maxSize, const char
*format,
+ const struct _HAIKU_BUILD_IDENTIFIER(tm) *tm))
_HAIKU_BUILD_DECLARE_FUNCTION(char *, strptime, (const char *buf,
const char *format, struct _HAIKU_BUILD_IDENTIFIER(tm) *tm))
Other related posts:
