summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2022-07-19 20:42:51 +0100
committerSimon McVittie <smcv@collabora.com>2022-07-19 21:11:09 +0100
commit36038fb1263c64a58b439e43a19d9d164d366601 (patch)
treed049d0568300dc860a8bcf045fccf7141193e73e /cmake
parent624efc0781411c3c7d46c2e33863b8c38fe4d464 (diff)
downloaddbus-36038fb1263c64a58b439e43a19d9d164d366601.tar.gz
Remove fallback implementation of strtoll(), strtoull()
We now require a (mostly-)C99 compiler, which guarantees the presence of these functions. Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/ConfigureChecks.cmake2
-rw-r--r--cmake/config.h.cmake12
2 files changed, 0 insertions, 14 deletions
diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index f4680f9b..3d4e0f2b 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -50,8 +50,6 @@ check_symbol_exists(socketpair "sys/socket.h" HAVE_SOCKETPAIR) #
check_symbol_exists(setlocale "locale.h" HAVE_SETLOCALE) # dbus-test-main.c
check_symbol_exists(localeconv "locale.h" HAVE_LOCALECONV) # dbus-sysdeps.c
check_symbol_exists(poll "poll.h" HAVE_POLL) # dbus-sysdeps-unix.c
-check_symbol_exists(strtoll "stdlib.h" HAVE_STRTOLL) # dbus-send.c
-check_symbol_exists(strtoull "stdlib.h" HAVE_STRTOULL) # dbus-send.c
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
check_symbol_exists(pipe2 "fcntl.h;unistd.h" HAVE_PIPE2)
check_symbol_exists(accept4 "sys/socket.h" HAVE_ACCEPT4)
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 44b79c03..88992149 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -185,12 +185,6 @@
/* Define to 1 if you have localeconv */
#cmakedefine HAVE_LOCALECONV 1
-/* Define to 1 if you have strtoll */
-#cmakedefine HAVE_STRTOLL 1
-
-/* Define to 1 if you have strtoull */
-#cmakedefine HAVE_STRTOULL 1
-
/* Define to 1 if you have pip2 */
#cmakedefine HAVE_PIPE2 1
@@ -256,12 +250,6 @@
# define gid_t int
# else
typedef int mode_t;
-# if !defined(_WIN32_WCE)
-# define strtoll _strtoi64
-# define strtoull _strtoui64
-# define HAVE_STRTOLL 1
-# define HAVE_STRTOULL 1
-# endif
# endif
#endif // defined(_WIN32) || defined(_WIN64)