summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-11-28 12:28:03 +0100
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-11-28 13:33:19 +0100
commitb028a6001ad7e440fbd71faa45cad8b5966fac1c (patch)
treec9629863a832d2c24b7d9fe6a335766a7033cea0
parent7e2b315ca0f228b617adc7769f3880a8aabd5d67 (diff)
downloadsamba-b028a6001ad7e440fbd71faa45cad8b5966fac1c.tar.gz
samba-b028a6001ad7e440fbd71faa45cad8b5966fac1c.tar.bz2
samba-b028a6001ad7e440fbd71faa45cad8b5966fac1c.zip
replace:wscript - change the "bool" checks to be compatible with more platforms
- If the type was found then we are fine and define "HAVE_BOOL" - Othewise we substitute it in "replace.h" as "_Bool" or if not possible as "int" - This prevents lot of warnings on platforms where we don't have a "bool" type as Tru64 - The length check for "bool" is not really useful and therefore removed
-rw-r--r--lib/replace/wscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 0bfe660f34..f6a9befc0d 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -73,8 +73,8 @@ def configure(conf):
conf.CHECK_TYPES('"long long" intptr_t uintptr_t ptrdiff_t comparison_fn_t')
conf.CHECK_TYPE('_Bool', define='HAVE__Bool')
+ conf.CHECK_TYPE('bool', define='HAVE_BOOL')
- conf.CHECK_TYPE('bool', 'int')
conf.CHECK_TYPE('int8_t', 'char')
conf.CHECK_TYPE('uint8_t', 'unsigned char')
conf.CHECK_TYPE('int16_t', 'short')
@@ -91,7 +91,7 @@ def configure(conf):
conf.CHECK_TYPE('volatile int', define='HAVE_VOLATILE')
conf.CHECK_TYPE('uint_t', 'unsigned int')
- conf.CHECK_SIZEOF('bool char int "long long" long short size_t ssize_t')
+ conf.CHECK_SIZEOF('char int "long long" long short size_t ssize_t')
conf.CHECK_SIZEOF('int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t')
conf.CHECK_SIZEOF('void*', define='SIZEOF_VOID_P')
conf.CHECK_SIZEOF('off_t dev_t ino_t time_t')