root / trunk / tool / include.diff

usr/include/Security/Authorization.h

@@ -30 +30 @@
 #ifndef _SECURITY_AUTHORIZATION_H_
 #define _SECURITY_AUTHORIZATION_H_
 
-#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
+#include <MacTypes.h>
 #include <stdio.h>
 
 #if defined(__cplusplus)

usr/include/Availability.h

@@ -98 +98 @@
 #define __MAC_10_6      1060
 #define __MAC_NA        9999   /* not available */
 
+#define __IPHONE_1_0     10000  
+#define __IPHONE_1_2     10200  
 #define __IPHONE_2_0     20000  
 #define __IPHONE_NA      99999  /* not available */
 

usr/include/AvailabilityInternal.h

@@ -21 +21 @@
 #ifndef __IPHONE_OS_VERSION_MIN_REQUIRED
         #ifdef __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__
         // compiler sets __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ when -miphoneos-version-min is used
-        #define __IPHONE_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_IPHONE_VERSION_MIN_REQUIRED__
+        #define __IPHONE_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__
     #endif
 #endif
 
@@ -31 +31 @@
     #ifndef __IPHONE_OS_VERSION_MAX_ALLOWED
         #define __IPHONE_OS_VERSION_MAX_ALLOWED     __IPHONE_2_0
     #endif
-    // make sure a valid min is set
-    #if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_2_0
-        #undef __IPHONE_OS_VERSION_MIN_REQUIRED
-        #define __IPHONE_OS_VERSION_MIN_REQUIRED    __IPHONE_2_0 
-    #endif
     
     // set up internal macros
      #if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_2_0
@@ -45 +40 @@
     #else
         #define __AVAILABILITY_INTERNAL__IPHONE_2_0
     #endif
+     #if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_1_2
+        #define __AVAILABILITY_INTERNAL__IPHONE_1_2          __AVAILABILITY_INTERNAL_UNAVAILABLE
+    #elif __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_1_2
+        #define __AVAILABILITY_INTERNAL__IPHONE_1_2          __AVAILABILITY_INTERNAL_WEAK_IMPORT
+    #else
+        #define __AVAILABILITY_INTERNAL__IPHONE_1_2
+    #endif
     #define __AVAILABILITY_INTERNAL__IPHONE_NA                     __AVAILABILITY_INTERNAL_UNAVAILABLE 
     #define __AVAILABILITY_INTERNAL__IPHONE_2_0_DEP__IPHONE_NA     __AVAILABILITY_INTERNAL__IPHONE_2_0
     #define __AVAILABILITY_INTERNAL__IPHONE_2_0_DEP__IPHONE_2_0    __AVAILABILITY_INTERNAL_DEPRECATED
@@ -50 +50 @@
     #define __AVAILABILITY_INTERNAL__IPHONE_2_0_DEP__IPHONE_2_0    __AVAILABILITY_INTERNAL_DEPRECATED
     #define __AVAILABILITY_INTERNAL__IPHONE_NA_DEP__IPHONE_NA      __AVAILABILITY_INTERNAL_UNAVAILABLE
     
+    #if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_1_2
+        #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_1_2        __AVAILABILITY_INTERNAL_DEPRECATED
+    #else
+        #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_1_2        __AVAILABILITY_INTERNAL__IPHONE_1_0
+    #endif
+    #if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_2_0
+        #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_2_0        __AVAILABILITY_INTERNAL_DEPRECATED
+        #define __AVAILABILITY_INTERNAL__IPHONE_1_2_DEP__IPHONE_2_0        __AVAILABILITY_INTERNAL_DEPRECATED
+    #else
+        #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_2_0        __AVAILABILITY_INTERNAL__IPHONE_1_0
+        #define __AVAILABILITY_INTERNAL__IPHONE_1_2_DEP__IPHONE_2_0        __AVAILABILITY_INTERNAL__IPHONE_1_2
+    #endif
+    
 #elif defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)
     // compiler for Mac OS X sets __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
     #define __MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__

usr/include/AvailabilityMacros.h

@@ -84 +84 @@
     #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
         #define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
     #else
-        #if __ppc64__ || __i386__ || __x86_64__
+        #ifdef __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__
+            #if __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
+                #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_4
+            #else
+                #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_5
+            #endif
+        #elif __ppc64__ || __i386__ || __x86_64__
             #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_4
                 #elif __arm__
                         #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_5

usr/include/sys/cdefs.h

@@ -253 +253 @@
 
 /* These settings are particular to each product. */
 /* Product: iPhone */
+#if __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__-0 >= 20000
 #define __DARWIN_ONLY_64_BIT_INO_T      1
+#endif
 #define __DARWIN_ONLY_UNIX_CONFORMANCE  1
 #define __DARWIN_ONLY_VERS_1050         1
 

usr/include/CoreFoundation/CoreFoundation.h

@@ -78 +78 @@
 #include <CoreFoundation/CFMachPort.h>
 #include <CoreFoundation/CFUserNotification.h>
 #endif
-#if (TARGET_OS_MAC && !TARGET_OS_EMBEDDED)
+#if (TARGET_OS_MAC && !TARGET_OS_EMBEDDED) || TARGET_OS_EMBEDDED
 #include <CoreFoundation/CFXMLNode.h>
 #include <CoreFoundation/CFXMLParser.h>
 #ifndef CF_OPEN_SOURCE

usr/include/WebCore/EventTargetNode.h

@@ -102 +102 @@
     friend class EventTarget;
     RegisteredEventListenerList* m_regdListeners;
 
-    HashMap<Node *, int> * EventTargetNode::WebThreadGetCurrentDOMMouseWheelEventListeners();
-    HashMap<Node *, int> * EventTargetNode::WebThreadGetCurrentDOMMouseMoveEventListeners();
-    HashMap<Node *, int> * EventTargetNode::WebThreadGetCurrentDOMMouseClickEventListeners();
+    HashMap<Node *, int> * WebThreadGetCurrentDOMMouseWheelEventListeners();
+    HashMap<Node *, int> * WebThreadGetCurrentDOMMouseMoveEventListeners();
+    HashMap<Node *, int> * WebThreadGetCurrentDOMMouseClickEventListeners();
 
 private:
     virtual void refEventTarget() { ref(); }

usr/include/CarbonCore/FixMath.h

@@ -90 +90 @@
 
 #else
 
-    #error "Unknown architecture."
+    //#error "Unknown architecture."
     // To use unoptimized standard C code, remove above line.
     #define _IntSaturate(x) ((x) <= -0x1p31f ? (int) -0x80000000 : \
         0x1p31f <= (x) ? (int) 0x7fffffff : (int) (x))

usr/include/CarbonCore/fp.h

@@ -1314 +1314 @@
 *   dec2l       Similar to dec2num except a long is returned.                   *
 *                                                                               *
 ********************************************************************************/
-#if TARGET_CPU_PPC || TARGET_CPU_X86 || TARGET_CPU_PPC64 || TARGET_CPU_X86_64
+#if TARGET_CPU_PPC || TARGET_CPU_X86 || TARGET_CPU_PPC64 || TARGET_CPU_X86_64 || TARGET_CPU_ARM
     #define SIGDIGLEN      36  
 #endif
 #define      DECSTROUTLEN   80               /* max length for dec2str output */

usr/include/machine/locks.h

@@ -27 +27 @@
 #include "ppc/locks.h"
 #elif defined (__i386__)
 #include "i386/locks.h"
+#elif defined (__arm__)
+#include "arm/locks.h"
 #else
 #error architecture not supported
 #endif

usr/include/CarbonCore/MachineExceptions.h

@@ -277 +277 @@
 typedef struct ExceptionInformation     ExceptionInformation;
 #endif  /* TARGET_CPU_X86 */
 
+#if TARGET_CPU_ARM
+
+struct MachineInformationARM {
+    int unused;
+};
+typedef struct MachineInformationARM MachineInformationARM;
+
+struct RegisterInformationARM {
+    unsigned int R0; 
+    unsigned int R1; 
+    unsigned int R2; 
+    unsigned int R3; 
+    unsigned int R4; 
+    unsigned int R5; 
+    unsigned int R6; 
+    unsigned int R7; 
+    unsigned int R8; 
+    unsigned int R9; 
+    unsigned int R10; 
+    unsigned int R11; 
+    unsigned int R12; 
+    unsigned int R13; 
+    unsigned int R14; 
+    unsigned int R15; 
+    unsigned int R16; 
+    unsigned int R17; 
+};
+typedef struct RegisterInformationARM RegisterInformationARM;
+
+struct FPUInformationARM {
+    unsigned int dunno; /* FIXME */
+};
+typedef struct FPUInformationARM FPUInformationARM;
+
+struct VectorInformationARM {
+    unsigned int dunno[8];
+};
+typedef struct VectorInformationARM VectorInformationARM;
+
+typedef MachineInformationARM         MachineInformation;
+typedef RegisterInformationARM        RegisterInformation;
+typedef FPUInformationARM             FPUInformation;
+typedef VectorInformationARM          VectorInformation;
+struct ExceptionInformation {
+  ExceptionKind       theKind;
+  MachineInformation * machineState;
+  RegisterInformation * registerImage;
+  FPUInformation *    FPUImage;
+  ExceptionInfo       info;
+  VectorInformation * vectorImage;
+};
+typedef struct ExceptionInformation     ExceptionInformation;
+#endif
+
 /* 
     Note:   An ExceptionHandler is NOT a UniversalProcPtr, except in Carbon.
             It must be a PowerPC function pointer with NO routine descriptor, 

Foundation/NSAffineTransform.h

@@ -4 +4 @@
 
 #import <Foundation/NSObject.h>
 #import <Foundation/NSGeometry.h>
-#import <ApplicationServices/../Frameworks/CoreGraphics.framework/Headers/CGAffineTransform.h>
+#import <CoreGraphics/CGAffineTransform.h>
 
 typedef struct {
     CGFloat m11, m12, m21, m22;

usr/include/Foundation/NSFileManager.h

@@ -97 +97 @@
 - (BOOL)linkPath:(NSString *)src toPath:(NSString *)dest handler:(id)handler;
 - (BOOL)copyPath:(NSString *)src toPath:(NSString *)dest handler:(id)handler;
 - (BOOL)movePath:(NSString *)src toPath:(NSString *)dest handler:(id)handler;   
-- (BOOL)removeFileAtPath:(NSString *)path handler:(id)handler;
 #endif
+- (BOOL)removeFileAtPath:(NSString *)path handler:(id)handler;
 
 /* Process working directory management. Despite the fact that these are instance methods on NSFileManager, these methods report and change (respectively) the working directory for the entire process. Developers are cautioned that doing so is fraught with peril.
  */

Foundation/NSGeometry.h

@@ -6 +6 @@
 #import <Foundation/NSValue.h>
 #import <Foundation/NSCoder.h>
 
-#import <ApplicationServices/../Frameworks/CoreGraphics.framework/Headers/CGBase.h>
-#import <ApplicationServices/../Frameworks/CoreGraphics.framework/Headers/CGGeometry.h>
+#import <CoreGraphics/CGBase.h>
+#import <CoreGraphics/CGGeometry.h>
 
 #if __LP64__ || NS_BUILD_32_LIKE_64
 

usr/include/AppKit/NSOpenGL.h

@@ -6 +6 @@
 */
 
 #import <Foundation/NSObject.h>
+
+#ifdef __arm__
+#import <OpenGLES/ES1/gl.h>
+#else
 #import <OpenGL/gl.h>
+#endif
 
 @class NSData, NSView, NSScreen;
 

usr/include/CoreVideo/CVDisplayLink.h

@@ -24 +24 @@
 #include <ApplicationServices/ApplicationServices.h>
 #include <CoreVideo/CVReturn.h>
 #include <CoreVideo/CVBase.h>
+
+#ifdef __arm__
+#include <OpenGLES/EAGL.h>
+#else
 #include <OpenGL/OpenGL.h>
+#endif
 
 #if defined(__cplusplus)
 extern "C" {

usr/include/CoreVideo/CVOpenGLBuffer.h

@@ -17 +17 @@
 #define __COREVIDEO_CVOPENGLBUFFER_H__ 1
 
 #include <CoreVideo/CVImageBuffer.h>
+
+#ifdef __arm__
+#include <OpenGLES/EAGL.h>
+#include <OpenGLES/ES1/gl.h>
+#else
 #include <OpenGL/OpenGL.h>
 #include <OpenGL/gl.h>
+#endif
 
 
 #if defined(__cplusplus)

usr/include/CoreVideo/CVOpenGLTexture.h

@@ -20 +20 @@
 #include <CoreVideo/CVReturn.h>
 #include <CoreVideo/CVImageBuffer.h>
 #include <ApplicationServices/ApplicationServices.h>
+
+#ifdef __arm__
+#include <OpenGLES/EAGL.h>
+#include <OpenGLES/ES1/gl.h>
+#else
 #include <OpenGL/OpenGL.h>
 #include <OpenGL/gl.h>
+#endif
+
 #include <stddef.h>
 #include <stdint.h>
 

usr/include/CoreVideo/CVOpenGLTextureCache.h

@@ -13 +13 @@
 #include <CoreVideo/CVReturn.h>
 #include <CoreVideo/CVBuffer.h>
 #include <CoreVideo/CVOpenGLTexture.h>
+
+#ifdef __arm__
+#include <OpenGLES/EAGL.h>
+#else
 #include <OpenGL/OpenGL.h>
+#endif
 
 #if defined(__cplusplus)
 extern "C" {

usr/include/QuartzCore/CAOpenGLLayer.h

@@ -5 +5 @@
 
 #import <QuartzCore/CALayer.h>
 #import <QuartzCore/CVBase.h>
+
+#ifdef __arm__
+#import <OpenGLES/EAGL.h>
+#else
 #import <OpenGL/OpenGL.h>
+#endif
 
 @interface CAOpenGLLayer : CALayer
 {

usr/include/OSServices/OSServices.h

@@ -53 +53 @@
 #include <OSServices/WSTypes.h>
 #endif
 
+#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE))
 #ifndef __WSMETHODINVOCATION__
 #include <OSServices/WSMethodInvocation.h>
 #endif
@@ -60 +61 @@
 #ifndef __WSPROTOCOLHANDLER__
 #include <OSServices/WSProtocolHandler.h>
 #endif
+#endif
 
 
 #if !__LP64__

usr/include/Security/KCExceptions.h

@@ -28 +28 @@
 #ifndef _SECURITY_KCEXCEPTIONS_H_
 #define _SECURITY_KCEXCEPTIONS_H_
 
-#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>
+#include <CarbonCore/MacErrors.h>
 #include <security_utilities/errors.h>
 
 #ifdef lock

usr/include/Security/KCUtilities.h

@@ -25 +25 @@
 #define _SECURITY_KCUTILITIES_H_
 
 #include <security_utilities/errors.h>
-#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>
+#include <CarbonCore/MacErrors.h>
 
 namespace Security
 {

usr/include/Security/Keychains.h

@@ -106 +106 @@
         typedef KeychainSchemaImpl Impl;
 };
 
-
+class ItemImpl;
 class KeychainImpl : public SecCFObject, private CssmClient::Db::DefaultCredentialsMaker
 {
     NOCOPY(KeychainImpl)

usr/include/Security/cs.h

@@ -31 +31 @@
 #include <Security/CodeSigning.h>
 #include <Security/SecCodeSigner.h>
 #include <Security/SecBasePriv.h>
-#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>
+#include <CarbonCore/MacErrors.h>
 #include <security_utilities/globalizer.h>
 #include <security_utilities/seccfobject.h>
 #include <security_utilities/cfclass.h>

usr/include/Security/cspclient.h

@@ -67 +67 @@
         Context(const CSP &csp, CSSM_ALGORITHMS alg = CSSM_ALGID_NONE);
         ~Context();
 
-        CSP Context::attachment() const { return parent<CSP>(); }
-        Module Context::module() const { return attachment()->module(); }
+        CSP attachment() const { return parent<CSP>(); }
+        Module module() const { return attachment()->module(); }
         
         CSSM_ALGORITHMS algorithm() const { return mAlgorithm; }
         void algorithm(CSSM_ALGORITHMS alg);

usr/include/Security/mach++.h

@@ -192 +192 @@
         mutable char nameBuffer[BOOTSTRAP_MAX_NAME_LEN];
     
 protected:
-        char *Bootstrap::makeName(const char *s) const
+        char *makeName(const char *s) const
         { return strncpy(nameBuffer, s, BOOTSTRAP_MAX_NAME_LEN); }
 };
 

usr/include/Security/objectacl.h

@@ -125 +125 @@
         virtual bool validate(const AclValidationContext &ctx) const = 0;
 
                 template <class Action>
-                void ObjectAcl::Entry::exportBlob(Action &pub, Action &priv)
+                void exportBlob(Action &pub, Action &priv)
                 {
                         Endian<uint32> del = delegate; pub(del);        // 4 bytes delegate flag
                         exportSubject(subject, pub, priv);      // subject itself (polymorphic)
@@ -197 +197 @@
         // These helpers deal with transferring one subject from/to reader/writer streams.
         // You'd usually only call those from complex subject implementations (e.g. threshold)
         template <class Action>
-        static void ObjectAcl::exportSubject(AclSubject *subject, Action &pub, Action &priv)
+        static void exportSubject(AclSubject *subject, Action &pub, Action &priv)
         {
                 Endian<uint32> typeAndVersion = subject->type() | subject->version() << AclSubject::versionShift;
                 pub(typeAndVersion);

usr/include/arm/signal.h

@@ -13 +13 @@
 
 #ifndef _ANSI_SOURCE
 
+typedef int sig_atomic_t;
+
 #ifdef __APPLE_API_OBSOLETE
 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
@@ -20 +22 @@
 #define __need_struct_sigcontext
 #include <arm/_structs.h>
 
-typedef int sig_atomic_t;
-
 #endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
 
 #endif /* __APPLE_API_OBSOLETE */

usr/include/mach/arm/_structs.h

@@ -25 +25 @@
 };
 #endif /* __DARWIN_UNIX03 */
 
-#if __DARWIN_UNIX03
+#if __DARWIN_UNIX03 || 1
 #define _STRUCT_ARM_THREAD_STATE        struct __darwin_arm_thread_state
 _STRUCT_ARM_THREAD_STATE
 {

usr/include/arm/_structs.h

@@ -38 +38 @@
 #endif /* _STRUCT_MCONTEXT */
 #endif /* __need_struct_mcontext */
 
+#ifdef __need_mcontext_t
+#undef __need_mcontext_t
+#ifndef _MCONTEXT_T
+#define _MCONTEXT_T
+typedef _STRUCT_MCONTEXT        *mcontext_t;
+#endif /* _MCONTEXT_T */
+#endif /* __need_mcontext_t */
+
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 #ifndef ARM_MCONTEXT_SIZE
 #define ARM_MCONTEXT_SIZE       (ARM_THREAD_STATE_COUNT + ARM_VFP_STATE_COUNT + ARM_EXCEPTION_STATE_COUNT) * sizeof(int)

usr/include/mach/arm/thread_status.h

@@ -2 +2 @@
 #define _MACH_ARM_THREAD_STATUS_H_
 
 #define ARM_THREAD_STATE        1
+#define THREAD_STATE_NONE       2
 
 typedef struct arm_thread_state {
        unsigned int r0;

usr/include/arm/_types.h

@@ -15 +15 @@
 typedef char                    __int8_t;
 #endif  /* !__GNUC__ */
 typedef unsigned char           __uint8_t;
-typedef unsigned short          __int16_t;
+typedef short                   __int16_t;
 typedef unsigned short          __uint16_t;
 typedef int                     __int32_t;
 typedef unsigned int            __uint32_t;

usr/include/util.h

@@ -86 +86 @@
 
 __BEGIN_DECLS
 struct utmp; /* forward reference to /usr/include/utmp.h */
-void    login(struct utmp *)            __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+void    login(struct utmp *)            __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_1_2,__IPHONE_2_0);
 int     login_tty(int);
-int     logout(const char *)            __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+int     logout(const char *)            __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_1_2,__IPHONE_2_0);
 void    logwtmp(const char *, const char *, const char *) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_2_0,__IPHONE_2_0);
 int     opendev(char *, int, int, char **);
 int     openpty(int *, int *, char *, struct termios *,

usr/include/utmp.h

@@ -92 +92 @@
         time_t  ll_time;
         char    ll_line[UT_LINESIZE];
         char    ll_host[UT_HOSTSIZE];
-}                                       __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+}                                       __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_1_2,__IPHONE_2_0);
 
 struct utmp {
         char    ut_line[UT_LINESIZE];
         char    ut_name[UT_NAMESIZE];
         char    ut_host[UT_HOSTSIZE];
         long    ut_time;
-}                                       __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+}                                       __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_1_2,__IPHONE_2_0);
 
 #endif /* !_UTMP_H_ */

usr/include/c++/4.0.0/arm-apple-darwin8/bits/c++config.h

@@ -127 +127 @@
 #define _GLIBCXX_USE_C99_COMPLEX 1
 
 // Define if code specialized for wchar_t should be used.
-#define _GLIBCXX_USE_WCHAR_T 1
+/* #undef _GLIBCXX_USE_WCHAR_T */
 
 // Define if using setrlimit to set resource limits during 'make check'.
 #define _GLIBCXX_RES_LIMITS 1

usr/include/c++/4.0.0/bits/stringfwd.h

@@ -61 +61 @@
 
 #ifdef _GLIBCXX_USE_WCHAR_T
   template<> struct char_traits<wchar_t>;
+#endif
 
   typedef basic_string<wchar_t> wstring;
-#endif
 } // namespace std
 
 #endif  // _STRINGFWD_H