summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorEric Haszlakiewicz <erh+git@nimenees.com>2020-04-09 20:58:28 +0000
committerEric Haszlakiewicz <erh+git@nimenees.com>2020-04-09 20:58:28 +0000
commit545464322b2c8226ab6ff52ff4767f7d40518064 (patch)
treed29bce2bf9bef033d8672312ccb640744f9ca0cf /cmake
parentb64bdfe38147408ce236527bf32f0483b4a3e51e (diff)
downloadjson-c-545464322b2c8226ab6ff52ff4767f7d40518064.tar.gz
Issue #568: fix the strtoll and strtoull handing so config.h ends up creating defines for those only when needed, which should exclude mingw environments.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/config.h.in11
1 files changed, 9 insertions, 2 deletions
diff --git a/cmake/config.h.in b/cmake/config.h.in
index 3539d6f..5e64e58 100644
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -136,9 +136,16 @@
#cmakedefine HAVE_VSYSLOG @HAVE_VSYSLOG@
#cmakedefine HAVE_STRTOLL
-#cmakedefine strtoll @json_c_strtoll@
+#if !defined(HAVE_STRTOLL)
+#define strtoll @json_c_strtoll@
+/* #cmakedefine json_c_strtoll @json_c_strtoll@*/
+#endif
+
#cmakedefine HAVE_STRTOULL
-#cmakedefine strtoull @json_c_strtoull@
+#if !defined(HAVE_STRTOULL)
+#define strtoull @json_c_strtoull@
+/* #cmakedefine json_c_strtoull @json_c_strtoull@ */
+#endif
/* Have __thread */
#cmakedefine HAVE___THREAD