Bug 776871 - since compiler checks are skipped in Windows builds, add HAVE_NULLPTR manually in configure. r=ehsan
authorJim Mathies <jmathies@mozilla.com>
Wed, 25 Jul 2012 04:21:19 -0500
changeset 100390 8b5b175234df4ed97a5fb286ecf25b1a865df080
parent 100389 1244b8a8e57afe99e1069b25c84293708b8e41f2
child 100391 b00c1e7289dacb434c9e74e34932d777bffb2678
push id12476
push userjmathies@mozilla.com
push dateWed, 25 Jul 2012 09:28:32 +0000
treeherdermozilla-inbound@fe77957061ea [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs776871
milestone17.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 776871 - since compiler checks are skipped in Windows builds, add HAVE_NULLPTR manually in configure. r=ehsan
configure.in
--- a/configure.in
+++ b/configure.in
@@ -745,16 +745,19 @@ if test -n "$_WIN32_MSVC"; then
     SKIP_COMPILER_CHECKS=1
     SKIP_LIBRARY_CHECKS=1
 
     # Since we're skipping compiler and library checks, hard-code
     # some facts here.
     AC_DEFINE(HAVE_IO_H)
     AC_DEFINE(HAVE_SETBUF)
     AC_DEFINE(HAVE_ISATTY)
+    if test $_MSC_VER -ge 1600; then
+        AC_DEFINE(HAVE_NULLPTR)
+    fi
 fi
 
 fi # COMPILE_ENVIRONMENT
 
 AC_SUBST(MIDL_FLAGS)
 AC_SUBST(_MSC_VER)
 
 AC_SUBST(GNU_AS)