From 647d8e95d17b32100995d806b9b2a26a35541042 Mon Sep 17 00:00:00 2001 From: Oded Gabbay Date: Mon, 11 Jan 2016 21:55:15 +0200 Subject: [PATCH] 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 Reviewed-by: Jose Fonseca --- configure.ac | 2 +- scons/gallium.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9c3d1a3481e..8d19dabcb77 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 46dbf0ebd0e..6dcd95233c3 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: -- 2.30.2