diff options
| author | Oded Gabbay <oded.gabbay@gmail.com> | 2016-01-11 21:55:15 +0200 |
|---|---|---|
| committer | Oded Gabbay <oded.gabbay@gmail.com> | 2016-01-11 23:28:23 +0200 |
| commit | 647d8e95d17b32100995d806b9b2a26a35541042 (patch) | |
| tree | 3eb29c25301706150fe4d899a5004aec70a1f7e9 | |
| parent | aa6aa39a8fb560ffe362970ef9f2f221661a30c9 (diff) | |
| download | external_mesa3d-647d8e95d17b32100995d806b9b2a26a35541042.tar.gz external_mesa3d-647d8e95d17b32100995d806b9b2a26a35541042.tar.bz2 external_mesa3d-647d8e95d17b32100995d806b9b2a26a35541042.zip | |
configure.ac: always define __STDC_CONSTANT_MACROS
The ISO C99 standard (7.18.4) specifies that C++
implementations should define UINT64_C only when
__STDC_CONSTANT_MACROS is defined.
Because we now use UINT64_C in our cpp files (since commit
208bfc493debe0344d0b9cb93975981f14412628), we need to add this define.
This also solves compilation errors with GCC 4.8.x on ppc64le machines.
v2: add this define to SCons build system
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rwxr-xr-x | scons/gallium.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 9c3d1a3481..8d19dabcb7 100644 --- a/configure.ac +++ b/configure.ac @@ -245,7 +245,7 @@ _SAVE_LDFLAGS="$LDFLAGS" _SAVE_CPPFLAGS="$CPPFLAGS" dnl Compiler macros -DEFINES="-D__STDC_LIMIT_MACROS" +DEFINES="-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS" AC_SUBST([DEFINES]) case "$host_os" in linux*|*-gnu*|gnu*) diff --git a/scons/gallium.py b/scons/gallium.py index 46dbf0ebd0..6dcd95233c 100755 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -300,7 +300,7 @@ def generate(env): # C preprocessor options cppdefines = [] - cppdefines += ['__STDC_LIMIT_MACROS'] + cppdefines += ['__STDC_LIMIT_MACROS', '__STDC_CONSTANT_MACROS'] if env['build'] in ('debug', 'checked'): cppdefines += ['DEBUG'] else: |