Libc-1439.100.3.tar.gz

[apple/libc.git] / include / secure / _common.h

diff --git a/include/secure/_common.h b/include/secure/_common.h
index a2de0d10c1bad4fc39bab5e56729200c8f204c02..a7acfaa0de44cbeddb4adabeeb5dbb588056f6a1 100644 (file)
--- a/include/secure/_common.h
+++ b/include/secure/_common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2007, 2008 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -25,17 +25,17 @@
 #define _SECURE__COMMON_H_
 
 #undef _USE_FORTIFY_LEVEL
-#ifdef _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0
-#if _FORTIFY_SOURCE > 1
-#define _USE_FORTIFY_LEVEL 2
+#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
+#  if _FORTIFY_SOURCE > 1
+#    define _USE_FORTIFY_LEVEL 2
+#  else
+#    define _USE_FORTIFY_LEVEL 1
+#  endif
 #else
-#define _USE_FORTIFY_LEVEL 1
-#endif
-#else
-#define _USE_FORTIFY_LEVEL 0
+#  define _USE_FORTIFY_LEVEL 0
 #endif
 
 #define __darwin_obsz0(object) __builtin_object_size (object, 0)
-#define __darwin_obsz(object) __builtin_object_size (object, _USE_FORTIFY_LEVEL > 1)
+#define __darwin_obsz(object) __builtin_object_size (object, _USE_FORTIFY_LEVEL > 1 ? 1 : 0)
 
 #endif