From 60beada3660f2dead8267dfa8a04bdff1a24febc Mon Sep 17 00:00:00 2001
From: Apple <opensource@apple.com>
Date: Mon, 20 Feb 2006 21:33:13 +0000
Subject: [PATCH] CF-368.26.tar.gz

---
 Base.subproj/CFBase.h         | 2 +-
 Base.subproj/CoreFoundation.h | 4 ++++
 Makefile                      | 2 +-
 framework.make                | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Base.subproj/CFBase.h b/Base.subproj/CFBase.h
index 7bc8b60..dd6e668 100644
--- a/Base.subproj/CFBase.h
+++ b/Base.subproj/CFBase.h
@@ -130,7 +130,7 @@ extern "C" {
 #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__
diff --git a/Base.subproj/CoreFoundation.h b/Base.subproj/CoreFoundation.h
index 1baa647..7492d7b 100644
--- a/Base.subproj/CoreFoundation.h
+++ b/Base.subproj/CoreFoundation.h
@@ -28,6 +28,8 @@
 #define __COREFOUNDATION_COREFOUNDATION__ 1
 #define __COREFOUNDATION__ 1
 
+#if !defined(CF_EXCLUDE_CSTD_HEADERS)
+
 #include <sys/types.h>
 #include <stdarg.h>
 #include <assert.h>
@@ -53,6 +55,8 @@
 
 #endif
 
+#endif
+
 #include <CoreFoundation/CFBase.h>
 #include <CoreFoundation/CFArray.h>
 #include <CoreFoundation/CFBag.h>
diff --git a/Makefile b/Makefile
index 4685bde..16e7bae 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ include framework.make
 # 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
diff --git a/framework.make b/framework.make
index 34431c8..2f70262 100755
--- a/framework.make
+++ b/framework.make
@@ -131,8 +131,8 @@ endif
 #
 
 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"
-- 
2.45.2