diff options
| author | Andres Noetzli <andres.noetzli@gmail.com> | 2021-05-17 09:52:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-17 16:52:55 +0000 |
| commit | eed22b44b92d14be51f82e4871c926dee79eaf3a (patch) | |
| tree | dd22a27678c0e47e62c829b6497cab92335fd57a | |
| parent | 63281fbfe093b1d5e375a378bb59761f77256d08 (diff) | |
Include cinttypes instead of inttypes.h (#6548)
This commit changes the includes used by MiniSat. This commit changes
the includes from stdint.h/inttypes.h/limits.h to
cstdint/cinttypes/climits. This ensures that the macros in
cinttypes/inttypes.h, e.g., `PRIi64`, are actually defined. The C99
standard suggested that those macros are only defined for C++ code when
`__STDC_FORMAT_MACROS` is defined. This was never adopted by a C++
standard (https://en.cppreference.com/w/cpp/types/integer). However,
certain versions of mingw-w64 seem to require it with inttypes.h but not
cinttypes.
This fixes the nightly Windows build (tested in the Docker container
used by the nightlies).
| -rw-r--r-- | src/prop/bvminisat/mtl/IntTypes.h | 14 | ||||
| -rw-r--r-- | src/prop/minisat/mtl/IntTypes.h | 14 |
2 files changed, 22 insertions, 6 deletions
diff --git a/src/prop/bvminisat/mtl/IntTypes.h b/src/prop/bvminisat/mtl/IntTypes.h index 19ca38bea..7856dc07c 100644 --- a/src/prop/bvminisat/mtl/IntTypes.h +++ b/src/prop/bvminisat/mtl/IntTypes.h @@ -30,12 +30,20 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #else -# include <stdint.h> -# include <inttypes.h> +// In contrast to the original MiniSat source code, we are including the +// cstdint/cinttypes/climits headers instead of stdint.h/inttypes.h/limits.h +// here. This ensures that the macros in cinttypes/inttypes.h, e.g., PRIi64, +// are actually defined. The C99 standard suggested that those macros are only +// defined for C++ code when __STDC_FORMAT_MACROS is defined. This was never +// adopted by a C++ standard (https://en.cppreference.com/w/cpp/types/integer). +// However, certain versions of mingw-w64 seem to require it with inttypes.h +// but not cinttypes. +# include <cstdint> +# include <cinttypes> #endif -#include <limits.h> +#include <climits> //================================================================================================= diff --git a/src/prop/minisat/mtl/IntTypes.h b/src/prop/minisat/mtl/IntTypes.h index c48816284..f1fc84163 100644 --- a/src/prop/minisat/mtl/IntTypes.h +++ b/src/prop/minisat/mtl/IntTypes.h @@ -30,12 +30,20 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #else -# include <stdint.h> -# include <inttypes.h> +// In contrast to the original MiniSat source code, we are including the +// cstdint/cinttypes/climits headers instead of stdint.h/inttypes.h/limits.h +// here. This ensures that the macros in cinttypes/inttypes.h such as PRIi64 +// are actually defined. The C99 standard suggested that those macros are only +// defined for C++ code when __STDC_FORMAT_MACROS is defined. This was never +// adopted by a C++ standard (https://en.cppreference.com/w/cpp/types/integer). +// However, certain versions of mingw-w64 seem to require it with inttypes.h +// but not cinttypes. +# include <cstdint> +# include <cinttypes> #endif -#include <limits.h> +#include <climits> //================================================================================================= |