diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2015-04-09 03:54:31 +0000 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2015-04-09 03:54:31 +0000 |
| commit | cddde3c0d0e98a16eea40a0596d7f01c78566045 (patch) | |
| tree | 624d700cba48ae227bd551c0f9b6ec8ec5a70805 /build_win | |
| parent | 0fb36c67305c3219bda25ba189c951b5bac72821 (diff) | |
| parent | 9dec7cd878521b09a5c980fd6edf99e655094a2d (diff) | |
| download | mongo-cddde3c0d0e98a16eea40a0596d7f01c78566045.tar.gz | |
Merge branch 'develop' into named-snapshots
Conflicts:
src/config/config_def.c
Diffstat (limited to 'build_win')
| -rw-r--r-- | build_win/wiredtiger_config.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build_win/wiredtiger_config.h b/build_win/wiredtiger_config.h index d52b3b3ae33..80dc11d7671 100644 --- a/build_win/wiredtiger_config.h +++ b/build_win/wiredtiger_config.h @@ -88,9 +88,6 @@ /* Define to 1 if you have the `posix_memalign' function. */ /* #undef HAVE_POSIX_MEMALIGN */ -/* Define to 1 if you have the <pthread_np.h> header file. */ -/* #undef HAVE_PTHREAD_NP_H */ - /* Build the LevelDB API with RocksDB support. */ /* #undef HAVE_ROCKSDB */ @@ -124,6 +121,9 @@ /* Enable verbose message configuration. */ /* #undef HAVE_VERBOSE */ +/* Define to 1 if you have the <x86intrin.h> header file. */ +#define HAVE_X86INTRIN_H 1 + /* Spinlock type from mutex.h. */ #define SPINLOCK_TYPE SPINLOCK_MSVC |