diff options
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | src/mongo/db/storage/mmap_v1/mmap_posix.cpp | 4 | ||||
| -rw-r--r-- | src/third_party/tz/timegm.c | 3 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/SConscript | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct index 58fc2cdc1cf..821b16a1470 100644 --- a/SConstruct +++ b/SConstruct @@ -1410,7 +1410,7 @@ if env.TargetOSIs('posix'): "-Wno-unknown-pragmas", "-Winvalid-pch"] ) # env.Append( " -Wconversion" ) TODO: this doesn't really work yet - if env.TargetOSIs('linux', 'osx'): + if env.TargetOSIs('linux', 'osx', 'solaris'): if not has_option("disable-warnings-as-errors"): env.Append( CCFLAGS=["-Werror"] ) diff --git a/src/mongo/db/storage/mmap_v1/mmap_posix.cpp b/src/mongo/db/storage/mmap_v1/mmap_posix.cpp index f6960aee7cd..a5fdc361694 100644 --- a/src/mongo/db/storage/mmap_v1/mmap_posix.cpp +++ b/src/mongo/db/storage/mmap_v1/mmap_posix.cpp @@ -182,9 +182,7 @@ void* MemoryMappedFile::map(const char* filename, unsigned long long& length) { } -#if defined(__sun) -#warning madvise not supported on solaris yet -#else +#if !defined(__sun) if (isOptionSet(SEQUENTIAL)) { if (madvise(view, length, MADV_SEQUENTIAL)) { warning() << "map: madvise failed for " << filename << ' ' << errnoWithDescription() diff --git a/src/third_party/tz/timegm.c b/src/third_party/tz/timegm.c index e9227430010..05f692cd477 100644 --- a/src/third_party/tz/timegm.c +++ b/src/third_party/tz/timegm.c @@ -183,8 +183,7 @@ gmtsub(const time_t *const timep, const int_fast32_t offset, if (!gmt_is_set) { gmt_is_set = TRUE; - if (gmtptr != NULL) - gmtload(gmtptr); + gmtload(gmtptr); } result = timesub(timep, offset, gmtptr, tmp); #ifdef TM_ZONE diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript index 2febd888329..e1712895ce1 100644 --- a/src/third_party/wiredtiger/SConscript +++ b/src/third_party/wiredtiger/SConscript @@ -52,6 +52,9 @@ elif env.TargetOSIs('osx'): env.Append(CPPPATH=["build_darwin"]) elif env.TargetOSIs('solaris'): env.Append(CPPPATH=["build_solaris"]) + # For an explanation of __EXTENSIONS__, + # see http://docs.oracle.com/cd/E19253-01/816-5175/standards-5/index.html + env.Append(CPPDEFINES=["__EXTENSIONS__"]) elif env.TargetOSIs('freebsd'): env.Append(CPPPATH=["build_freebsd"]) elif env.TargetOSIs('openbsd'): |