diff options
| author | Tim 'mithro' Ansell <mithro@mithis.com> | 2017-11-24 15:34:46 +1100 |
|---|---|---|
| committer | Tim 'mithro' Ansell <mithro@mithis.com> | 2017-11-25 19:48:26 -0800 |
| commit | 34c9fbab5367133fe6e0365068f78762ded70623 (patch) | |
| tree | 46c7ad3e406217ebd96a70e0460655b36552585f /libs | |
| parent | 8d48b47450f5e62a7db1766da57d5736872077a9 (diff) | |
| download | yosys-34c9fbab5367133fe6e0365068f78762ded70623.tar.gz yosys-34c9fbab5367133fe6e0365068f78762ded70623.tar.bz2 yosys-34c9fbab5367133fe6e0365068f78762ded70623.zip | |
minisat: Only define __STDC_XXX_MACROS if not already defined.
Replace;
#define __STDC_LIMIT_MACROS
#define __STDC_FORMAT_MACROS
With
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#endif
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
This fixes a compile warning if you are defining these macros in your
CXXFLAGS (as some distros do).
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ezsat/ezminisat.cc | 6 | ||||
| -rw-r--r-- | libs/minisat/00_UPDATE.sh | 4 | ||||
| -rw-r--r-- | libs/minisat/Options.cc | 4 | ||||
| -rw-r--r-- | libs/minisat/SimpSolver.cc | 4 | ||||
| -rw-r--r-- | libs/minisat/Solver.cc | 4 | ||||
| -rw-r--r-- | libs/minisat/System.cc | 4 |
6 files changed, 23 insertions, 3 deletions
diff --git a/libs/ezsat/ezminisat.cc b/libs/ezsat/ezminisat.cc index e0ee6292d..4be5fd493 100644 --- a/libs/ezsat/ezminisat.cc +++ b/libs/ezsat/ezminisat.cc @@ -18,8 +18,12 @@ */ // needed for MiniSAT headers (see Minisat Makefile) -#define __STDC_LIMIT_MACROS +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS +#endif #include "ezminisat.h" diff --git a/libs/minisat/00_UPDATE.sh b/libs/minisat/00_UPDATE.sh index 2ffc11553..ea26215ab 100644 --- a/libs/minisat/00_UPDATE.sh +++ b/libs/minisat/00_UPDATE.sh @@ -9,8 +9,8 @@ rm -rf minisat_upstream sed -i -e 's,^#include *"minisat/[^/]\+/\?,#include ",' *.cc *.h sed -i -e 's/Minisat::memUsedPeak()/Minisat::memUsedPeak(bool)/' System.cc sed -i -e 's/PRI[iu]64/ & /' Options.h Solver.cc -sed -i -e '1 i #define __STDC_LIMIT_MACROS' *.cc -sed -i -e '1 i #define __STDC_FORMAT_MACROS' *.cc +sed -i -e '1 i #ifndef __STDC_LIMIT_MACROS\n#define __STDC_LIMIT_MACROS\n#endif' *.cc +sed -i -e '1 i #ifndef __STDC_FORMAT_MACROS\n#define __STDC_FORMAT_MACROS\n#endif' *.cc patch -p0 < 00_PATCH_mkLit_default_arg.patch patch -p0 < 00_PATCH_remove_zlib.patch diff --git a/libs/minisat/Options.cc b/libs/minisat/Options.cc index 1aff3fab2..5c45dd6ac 100644 --- a/libs/minisat/Options.cc +++ b/libs/minisat/Options.cc @@ -1,5 +1,9 @@ +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS +#endif /**************************************************************************************[Options.cc] Copyright (c) 2008-2010, Niklas Sorensson diff --git a/libs/minisat/SimpSolver.cc b/libs/minisat/SimpSolver.cc index fd5774e0e..7348a905d 100644 --- a/libs/minisat/SimpSolver.cc +++ b/libs/minisat/SimpSolver.cc @@ -1,5 +1,9 @@ +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS +#endif /***********************************************************************************[SimpSolver.cc] Copyright (c) 2006, Niklas Een, Niklas Sorensson Copyright (c) 2007-2010, Niklas Sorensson diff --git a/libs/minisat/Solver.cc b/libs/minisat/Solver.cc index ab476853a..f6d4fb5ae 100644 --- a/libs/minisat/Solver.cc +++ b/libs/minisat/Solver.cc @@ -1,5 +1,9 @@ +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS +#endif /***************************************************************************************[Solver.cc] Copyright (c) 2003-2006, Niklas Een, Niklas Sorensson Copyright (c) 2007-2010, Niklas Sorensson diff --git a/libs/minisat/System.cc b/libs/minisat/System.cc index ceef4292b..1921a1d71 100644 --- a/libs/minisat/System.cc +++ b/libs/minisat/System.cc @@ -1,5 +1,9 @@ +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS +#endif /***************************************************************************************[System.cc] Copyright (c) 2003-2006, Niklas Een, Niklas Sorensson Copyright (c) 2007-2010, Niklas Sorensson |