scons: always set __STDC_*_MACROS for C++ sources

Analogous to previous commit - just set the lot once throughout.

Cc: Jose Fonseca <jfonseca@vmware.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>

diff --git a/scons/gallium.py b/scons/gallium.py
index 767766fd6fe8a82516fec778855bc2749e8c4f3c..64dfdcc9d563415817360c3e83c0390c2cd2d184 100755 (executable)
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -291,8 +291,9 @@ def generate(env):
     # C preprocessor options
     cppdefines = []
     cppdefines += [
-        '__STDC_LIMIT_MACROS',
         '__STDC_CONSTANT_MACROS',
+        '__STDC_FORMAT_MACROS',
+        '__STDC_LIMIT_MACROS',
         'HAVE_NO_AUTOCONF',
     ]
     if env['build'] in ('debug', 'checked'):

diff --git a/scons/llvm.py b/scons/llvm.py
index 2d0f05b02797e6254c994f97b3e6beacdae63340..ec816e8a57791662a5e0c00b2d360e621b22a29e 100644 (file)
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -100,8 +100,6 @@ def generate(env):
 
         env.Prepend(CPPPATH = [os.path.join(llvm_dir, 'include')])
         env.AppendUnique(CPPDEFINES = [
-            '__STDC_LIMIT_MACROS', 
-            '__STDC_CONSTANT_MACROS',
             'HAVE_STDINT_H',
         ])
         env.Prepend(LIBPATH = [os.path.join(llvm_dir, 'lib')])