Permalink
Browse files

Merge commit '989b659e0e9107c129820d604bf9f21adcf2e46a' into feature

  • Loading branch information...
2 parents 4883890 + 989b659 commit 63c8016790dee41430470629bb9b3c5745f28aca @ttilley ttilley committed Sep 30, 2011
@@ -12,6 +12,7 @@
6A57F70713F5E614000BE6A9 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 6A57F70613F5E614000BE6A9 /* main.c */; };
6A81FCE8143429DF00F83EDD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A81FCE7143429DE00F83EDD /* CoreFoundation.framework */; };
6A81FCEC14342A6300F83EDD /* TSICTString.c in Sources */ = {isa = PBXBuildFile; fileRef = 6A81FCEA14342A6300F83EDD /* TSICTString.c */; };
+ EDF2B90D143584E800C6EF62 /* compat.c in Sources */ = {isa = PBXBuildFile; fileRef = EDF2B90C143584E800C6EF62 /* compat.c */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -25,6 +26,7 @@
6A81FCEA14342A6300F83EDD /* TSICTString.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TSICTString.c; sourceTree = "<group>"; };
6A81FCEB14342A6300F83EDD /* TSICTString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSICTString.h; sourceTree = "<group>"; };
6AD3022F13F8D758007F24E8 /* compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = compat.h; sourceTree = "<group>"; };
+ EDF2B90C143584E800C6EF62 /* compat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compat.c; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -78,6 +80,7 @@
6A20BF7E13FC9BC000C6C442 /* common.h */,
6A57F70613F5E614000BE6A9 /* main.c */,
6AD3022F13F8D758007F24E8 /* compat.h */,
+ EDF2B90C143584E800C6EF62 /* compat.c */,
);
path = fsevent_watch;
sourceTree = "<group>";
@@ -135,6 +138,7 @@
6A57F70713F5E614000BE6A9 /* main.c in Sources */,
6A20BF7F13FC9BC000C6C442 /* cli.c in Sources */,
6A81FCEC14342A6300F83EDD /* TSICTString.c in Sources */,
+ EDF2B90D143584E800C6EF62 /* compat.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -151,29 +155,45 @@
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_EXCEPTIONS = YES;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_ENABLE_OBJC_GC = unsupported;
GCC_ENABLE_SSE3_EXTENSIONS = YES;
GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES;
+ GCC_FAST_OBJC_DISPATCH = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+ GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
+ GCC_REUSE_STRINGS = YES;
GCC_STRICT_ALIASING = NO;
+ GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+ GCC_THREADSAFE_STATICS = YES;
+ GCC_UNROLL_LOOPS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_GLOBAL_CONSTRUCTORS = NO;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
+ GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
+ GCC_WARN_MISSING_PARENTHESES = YES;
GCC_WARN_PEDANTIC = YES;
GCC_WARN_SHADOW = YES;
LD_NO_PIE = NO;
+ LLVM_LTO = NO;
+ "LLVM_LTO[arch=x86_64]" = YES;
MACOSX_DEPLOYMENT_TARGET = 10.5;
ONLY_ACTIVE_ARCH = NO;
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = "";
STRIP_INSTALLED_PRODUCT = NO;
+ VALID_ARCHS = "i386 x86_64";
WARNING_CFLAGS = "-Wall";
};
name = Debug;
@@ -187,23 +207,39 @@
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_ENABLE_EXCEPTIONS = YES;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_ENABLE_OBJC_GC = unsupported;
GCC_ENABLE_SSE3_EXTENSIONS = YES;
GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES;
+ GCC_FAST_OBJC_DISPATCH = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+ GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
+ GCC_REUSE_STRINGS = YES;
GCC_STRICT_ALIASING = NO;
+ GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+ GCC_THREADSAFE_STATICS = YES;
+ GCC_UNROLL_LOOPS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_GLOBAL_CONSTRUCTORS = NO;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
+ GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
+ GCC_WARN_MISSING_PARENTHESES = YES;
GCC_WARN_PEDANTIC = YES;
GCC_WARN_SHADOW = YES;
LD_NO_PIE = NO;
+ LLVM_LTO = NO;
+ "LLVM_LTO[arch=x86_64]" = YES;
MACOSX_DEPLOYMENT_TARGET = 10.5;
ONLY_ACTIVE_ARCH = NO;
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = "";
+ VALID_ARCHS = "i386 x86_64";
};
name = Release;
};
@@ -0,0 +1,20 @@
+#include "compat.h"
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+FSEventStreamCreateFlags kFSEventStreamCreateFlagIgnoreSelf = 0x00000008;
+#endif
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
+FSEventStreamCreateFlags kFSEventStreamCreateFlagFileEvents = 0x00000010;
+FSEventStreamEventFlags kFSEventStreamEventFlagItemCreated = 0x00000100;
+FSEventStreamEventFlags kFSEventStreamEventFlagItemRemoved = 0x00000200;
+FSEventStreamEventFlags kFSEventStreamEventFlagItemInodeMetaMod = 0x00000400;
+FSEventStreamEventFlags kFSEventStreamEventFlagItemRenamed = 0x00000800;
+FSEventStreamEventFlags kFSEventStreamEventFlagItemModified = 0x00001000;
+FSEventStreamEventFlags kFSEventStreamEventFlagItemFinderInfoMod = 0x00002000;
+FSEventStreamEventFlags kFSEventStreamEventFlagItemChangeOwner = 0x00004000;
+FSEventStreamEventFlags kFSEventStreamEventFlagItemXattrMod = 0x00008000;
+FSEventStreamEventFlags kFSEventStreamEventFlagItemIsFile = 0x00010000;
+FSEventStreamEventFlags kFSEventStreamEventFlagItemIsDir = 0x00020000;
+FSEventStreamEventFlags kFSEventStreamEventFlagItemIsSymlink = 0x00040000;
+#endif
@@ -18,23 +18,23 @@
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
// ignoring events originating from the current process introduced in 10.6
-FSEventStreamCreateFlags kFSEventStreamCreateFlagIgnoreSelf = 0x00000008;
+extern FSEventStreamCreateFlags kFSEventStreamCreateFlagIgnoreSelf;
#endif
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
// file-level events introduced in 10.7
-FSEventStreamCreateFlags kFSEventStreamCreateFlagFileEvents = 0x00000010;
-FSEventStreamEventFlags kFSEventStreamEventFlagItemCreated = 0x00000100,
- kFSEventStreamEventFlagItemRemoved = 0x00000200,
- kFSEventStreamEventFlagItemInodeMetaMod = 0x00000400,
- kFSEventStreamEventFlagItemRenamed = 0x00000800,
- kFSEventStreamEventFlagItemModified = 0x00001000,
- kFSEventStreamEventFlagItemFinderInfoMod = 0x00002000,
- kFSEventStreamEventFlagItemChangeOwner = 0x00004000,
- kFSEventStreamEventFlagItemXattrMod = 0x00008000,
- kFSEventStreamEventFlagItemIsFile = 0x00010000,
- kFSEventStreamEventFlagItemIsDir = 0x00020000,
- kFSEventStreamEventFlagItemIsSymlink = 0x00040000;
+extern FSEventStreamCreateFlags kFSEventStreamCreateFlagFileEvents;
+extern FSEventStreamEventFlags kFSEventStreamEventFlagItemCreated,
+ kFSEventStreamEventFlagItemRemoved,
+ kFSEventStreamEventFlagItemInodeMetaMod,
+ kFSEventStreamEventFlagItemRenamed,
+ kFSEventStreamEventFlagItemModified,
+ kFSEventStreamEventFlagItemFinderInfoMod,
+ kFSEventStreamEventFlagItemChangeOwner,
+ kFSEventStreamEventFlagItemXattrMod,
+ kFSEventStreamEventFlagItemIsFile,
+ kFSEventStreamEventFlagItemIsDir,
+ kFSEventStreamEventFlagItemIsSymlink;
#endif
#endif // fsevent_watch_compat_h

0 comments on commit 63c8016

Please sign in to comment.