CF-368.26.tar.gz

diff --git a/Base.subproj/CFBase.h b/Base.subproj/CFBase.h
index 7bc8b60532c936750bfa85daf1a8fad7b52a866b..dd6e668be13ea45d0922f576e7e5f7678aa8f2c4 100644 (file)
--- a/Base.subproj/CFBase.h
+++ b/Base.subproj/CFBase.h
@@ -130,7 +130,7 @@ extern "C" {
 #endif
 
 #if !defined(CF_INLINE)
 #endif
 
 #if !defined(CF_INLINE)

-    #if defined(__GNUC__) && (__GNUC__ == 4)
+    #if defined(__GNUC__) && (__GNUC__ == 4) && !defined(DEBUG)

        #define CF_INLINE static __inline__ __attribute__((always_inline))
     #elif defined(__GNUC__)
     #define CF_INLINE static __inline__
        #define CF_INLINE static __inline__ __attribute__((always_inline))
     #elif defined(__GNUC__)
     #define CF_INLINE static __inline__

diff --git a/Base.subproj/CoreFoundation.h b/Base.subproj/CoreFoundation.h
index 1baa64750941bc8b3463ba7b5583d1761be6e858..7492d7bce41c31fbdcd9992b78644a69db9ef592 100644 (file)
--- a/Base.subproj/CoreFoundation.h
+++ b/Base.subproj/CoreFoundation.h
@@ -28,6 +28,8 @@
 #define __COREFOUNDATION_COREFOUNDATION__ 1
 #define __COREFOUNDATION__ 1
 
 #define __COREFOUNDATION_COREFOUNDATION__ 1
 #define __COREFOUNDATION__ 1
 

+#if !defined(CF_EXCLUDE_CSTD_HEADERS)
+

 #include <sys/types.h>
 #include <stdarg.h>
 #include <assert.h>
 #include <sys/types.h>
 #include <stdarg.h>
 #include <assert.h>


@@ -53,6 +55,8 @@
 
 #endif
 
 
 #endif
 

+#endif
+

 #include <CoreFoundation/CFBase.h>
 #include <CoreFoundation/CFArray.h>
 #include <CoreFoundation/CFBag.h>
 #include <CoreFoundation/CFBase.h>
 #include <CoreFoundation/CFArray.h>
 #include <CoreFoundation/CFBag.h>

diff --git a/Makefile b/Makefile
index 4685bde6b2ffc55d72874012119e89a12865bb98..16e7baee9341cbec8069b0a4f671abbc593c6701 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ include framework.make
 # Misc additional options
 #
 
 # Misc additional options
 #
 

-CURRENT_PROJECT_VERSION = 368.18
+CURRENT_PROJECT_VERSION = 368.26

 
 # common items all build styles should be defining
 CFLAGS += -DCF_BUILDING_CF=1
 
 # common items all build styles should be defining
 CFLAGS += -DCF_BUILDING_CF=1

diff --git a/framework.make b/framework.make
index 34431c8d7ddf56c29772e74f2a411a45545a6e92..2f70262402f21893a2e6e9742d1a09c84b14aa05 100755 (executable)
--- a/framework.make
+++ b/framework.make
@@ -131,8 +131,8 @@ endif
 #
 
 ifeq "$(PLATFORM)" "Darwin"
 #
 
 ifeq "$(PLATFORM)" "Darwin"

-C_WARNING_FLAGS += -Wno-precomp -Wno-four-char-constants -Wall
-CPP_WARNING_FLAGS += -Wno-precomp -Wno-four-char-constants -Wall
+C_WARNING_FLAGS += -Wno-four-char-constants -Wall
+CPP_WARNING_FLAGS += -Wno-four-char-constants -Wall

 endif
 
 ifeq "$(PLATFORM)" "CYGWIN"
 endif
 
 ifeq "$(PLATFORM)" "CYGWIN"