diff options
| -rw-r--r-- | third_party/snappy/mac/config.h | 76 | ||||
| -rw-r--r-- | third_party/snappy/snappy.gyp | 19 |
2 files changed, 88 insertions, 7 deletions
diff --git a/third_party/snappy/mac/config.h b/third_party/snappy/mac/config.h new file mode 100644 index 0000000..961c3ce --- /dev/null +++ b/third_party/snappy/mac/config.h @@ -0,0 +1,76 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ +/* Define to 1 if the compiler supports __builtin_ctz and friends. */ +#define HAVE_BUILTIN_CTZ 1 +/* Define to 1 if the compiler supports __builtin_expect. */ +#define HAVE_BUILTIN_EXPECT 1 +/* Define to 1 if you have the <dlfcn.h> header file. */ +#define HAVE_DLFCN_H 1 +/* Use the gflags package for command-line parsing. */ +/* #undef HAVE_GFLAGS */ +/* Defined when Google Test is available. */ +/* #undef HAVE_GTEST */ +/* Define to 1 if you have the <inttypes.h> header file. */ +#define HAVE_INTTYPES_H 1 +/* Define to 1 if you have the `fastlz' library (-lfastlz). */ +/* #undef HAVE_LIBFASTLZ */ +/* Define to 1 if you have the `lzf' library (-llzf). */ +/* #undef HAVE_LIBLZF */ +/* Define to 1 if you have the `lzo2' library (-llzo2). */ +/* #undef HAVE_LIBLZO2 */ +/* Define to 1 if you have the `quicklz' library (-lquicklz). */ +/* #undef HAVE_LIBQUICKLZ */ +/* Define to 1 if you have the `z' library (-lz). */ +#define HAVE_LIBZ 1 +/* Define to 1 if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H 1 +/* Define to 1 if you have the <stddef.h> header file. */ +#define HAVE_STDDEF_H 1 +/* Define to 1 if you have the <stdint.h> header file. */ +#define HAVE_STDINT_H 1 +/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 +/* Define to 1 if you have the <strings.h> header file. */ +#define HAVE_STRINGS_H 1 +/* Define to 1 if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 +/* Define to 1 if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 +/* Define to 1 if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the <unistd.h> header file. */ +#define HAVE_UNISTD_H 1 +/* Define to the sub-directory in which libtool stores uninstalled libraries. + * */ +#define LT_OBJDIR ".libs/" +/* Name of package */ +#define PACKAGE "snappy" +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" +/* Define to the full name of this package. */ +#define PACKAGE_NAME "snappy" +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "snappy 1.0.5" +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "snappy" +/* Define to the home page for this package. */ +#define PACKAGE_URL "" +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.0.5" +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 +/* Version number of package */ +#define VERSION "1.0.5" +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + * significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif diff --git a/third_party/snappy/snappy.gyp b/third_party/snappy/snappy.gyp index 877c2a0..da23700 100644 --- a/third_party/snappy/snappy.gyp +++ b/third_party/snappy/snappy.gyp @@ -48,11 +48,11 @@ }, 'cflags': [ '-Wno-header-hygiene' ], }], - ['OS=="linux"', { + ['OS=="linux" or OS=="mac"', { 'defines': [ - # TODO(tfarina): Only Linux has the generated config.h for now. - # Generate the config.h in the other platforms: mac, win and enable - # this for everyone. + # TODO(tfarina): Only Mac and Linux has the generated config.h for + # now. Generate the config.h for Windows too and enable this there + # as well. 'HAVE_CONFIG_H=1', ], }], @@ -70,9 +70,6 @@ { 'target_name': 'snappy_unittest', 'type': 'executable', - 'defines': [ - 'HAVE_CONFIG_H=1', - ], 'sources': [ 'src/snappy-test.cc', 'src/snappy-test.h', @@ -85,6 +82,14 @@ '../../third_party/zlib/zlib.gyp:zlib', ], 'conditions': [ + ['OS=="linux" or OS=="mac"', { + 'defines': [ + # TODO(tfarina): Only Mac and Linux has the generated config.h for + # now. Generate the config.h for Windows too and enable this there + # as well. + 'HAVE_CONFIG_H=1', + ], + }], ['clang == 1', { 'cflags': [ '-Wno-return-type', |