diff options
| author | Jason Carey <jcarey@argv.me> | 2015-08-10 10:55:11 -0400 |
|---|---|---|
| committer | Jason Carey <jcarey@argv.me> | 2015-08-10 12:25:03 -0400 |
| commit | 9f85761a98318bd411d53ec6afa16378238e85d7 (patch) | |
| tree | 03abc5b6114fd9983fa7351db5da4f0fa4892289 /src/third_party/mozjs-38 | |
| parent | af148d8ef5132d076813fd211639239d4518d33b (diff) | |
| download | mongo-9f85761a98318bd411d53ec6afa16378238e85d7.tar.gz | |
SERVER-19848 Don't define trunc in MozJS on win
MSVC 2013 started offering 'trunc' from math.h. Our SpiderMonkey
configuration does not set HAVE_TRUNC in configuration, so mozilla
generates a trunc, which then conflicts with the math.h provided trunc.
Fix that by setting HAVE_TRUNC in the windows configs.
Diffstat (limited to 'src/third_party/mozjs-38')
| -rw-r--r-- | src/third_party/mozjs-38/platform/i386/windows/build/js-confdefs.h | 1 | ||||
| -rw-r--r-- | src/third_party/mozjs-38/platform/x86_64/windows/build/js-confdefs.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/third_party/mozjs-38/platform/i386/windows/build/js-confdefs.h b/src/third_party/mozjs-38/platform/i386/windows/build/js-confdefs.h index c895b90ef2a..0c1d183ae35 100644 --- a/src/third_party/mozjs-38/platform/i386/windows/build/js-confdefs.h +++ b/src/third_party/mozjs-38/platform/i386/windows/build/js-confdefs.h @@ -13,6 +13,7 @@ #define HAVE_LOCALECONV 1 #define HAVE_LOCALECONV 1 #define HAVE_SNPRINTF 1 +#define HAVE_TRUNC 1 #define HAVE__GETC_NOLOCK 1 #define HAVE__MSIZE 1 #define HW_THREADS 1 diff --git a/src/third_party/mozjs-38/platform/x86_64/windows/build/js-confdefs.h b/src/third_party/mozjs-38/platform/x86_64/windows/build/js-confdefs.h index f1d8a0c8254..771ffd80b96 100644 --- a/src/third_party/mozjs-38/platform/x86_64/windows/build/js-confdefs.h +++ b/src/third_party/mozjs-38/platform/x86_64/windows/build/js-confdefs.h @@ -14,6 +14,7 @@ #define HAVE_LOCALECONV 1 #define HAVE_LOCALECONV 1 #define HAVE_SNPRINTF 1 +#define HAVE_TRUNC 1 #define HAVE__GETC_NOLOCK 1 #define HAVE__MSIZE 1 #define HW_THREADS 1 |