diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2017-06-14 23:54:38 +0000 |
|---|---|---|
| committer | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2017-06-15 08:50:53 +0000 |
| commit | a3393654f6ec49e012f9c79e7350a087340c4468 (patch) | |
| tree | c85226ee8e16fa56949d6962dfa78c9144e48e78 | |
| parent | Remove duplicated build checks. (diff) | |
| download | inkscape-a3393654f6ec49e012f9c79e7350a087340c4468.tar.gz inkscape-a3393654f6ec49e012f9c79e7350a087340c4468.zip | |
Remove cmake checks for C89 headers.
These are roughly equivalent to autoconf's AC_HEADER_STDC and even they
say that macro is obsolescent.
strings.h is not really a C89 header, but it defined some things that
are no longer needed [1]. And no file actually #includes it.
[1] https://stackoverflow.com/a/4291328
| -rw-r--r-- | CMakeScripts/ConfigChecks.cmake | 6 | ||||
| -rw-r--r-- | config.h.cmake | 21 | ||||
| -rw-r--r-- | src/trace/trace.h | 2 | ||||
| -rw-r--r-- | src/xml/repr-util.cpp | 4 |
4 files changed, 0 insertions, 33 deletions
diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index dd90eab65..b1e24fc08 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -19,8 +19,6 @@ CHECK_FUNCTION_EXISTS(fpsetmask HAVE_FPSETMASK) CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) CHECK_INCLUDE_FILES(ieeefp.h HAVE_IEEEFP_H) CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H) -CHECK_INCLUDE_FILES(locale.h HAVE_LC_MESSAGES) -CHECK_INCLUDE_FILES(locale.h HAVE_LOCALE_H) CHECK_INCLUDE_FILES(fcntl.h HAVE_FCNTL_H) CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO) CHECK_INCLUDE_FILES(malloc.h HAVE_MALLOC_H) @@ -29,11 +27,7 @@ CHECK_INCLUDE_FILES(memory.h HAVE_MEMORY_H) CHECK_FUNCTION_EXISTS(memset HAVE_MEMSET) CHECK_FUNCTION_EXISTS(pow HAVE_POW) CHECK_FUNCTION_EXISTS(sqrt HAVE_SQRT) -CHECK_INCLUDE_FILES(stddef.h HAVE_STDDEF_H) CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) -CHECK_INCLUDE_FILES(stdlib.h HAVE_STDLIB_H) -CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H) -CHECK_INCLUDE_FILES(string.h HAVE_STRING_H) CHECK_FUNCTION_EXISTS(strpbrk HAVE_STRPBRK) CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR) CHECK_FUNCTION_EXISTS(strspn HAVE_STRSPN) diff --git a/config.h.cmake b/config.h.cmake index 5d5d27c93..1dffd4f21 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -82,15 +82,9 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #cmakedefine HAVE_INTTYPES_H 1 -/* Define if your <locale.h> file defines LC_MESSAGES. */ -#cmakedefine HAVE_LC_MESSAGES 1 - /* Define to 1 if you have the `m' library (-lm). */ #cmakedefine HAVE_LIBM 1 -/* Define to 1 if you have the <locale.h> header file. */ -#cmakedefine HAVE_LOCALE_H 1 - /* Define to 1 if you have the `mallinfo' function. */ #cmakedefine HAVE_MALLINFO 1 @@ -137,24 +131,12 @@ zero-length file name argument. */ #cmakedefine HAVE_STAT_EMPTY_STRING_BUG 1 -/* Define to 1 if you have the <stddef.h> header file. */ -#cmakedefine HAVE_STDDEF_H 1 - /* Define to 1 if you have the <stdint.h> header file. */ #cmakedefine HAVE_STDINT_H 1 -/* Define to 1 if you have the <stdlib.h> header file. */ -#cmakedefine HAVE_STDLIB_H 1 - /* Define to 1 if you have the `strftime' function. */ #cmakedefine HAVE_STRFTIME 1 -/* Define to 1 if you have the <strings.h> header file. */ -#cmakedefine HAVE_STRINGS_H 1 - -/* Define to 1 if you have the <string.h> header file. */ -#cmakedefine HAVE_STRING_H 1 - /* Define to 1 if you have the `strpbrk' function. */ #cmakedefine HAVE_STRPBRK 1 @@ -243,9 +225,6 @@ /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ #cmakedefine STAT_MACROS_BROKEN 1 -/* Define to 1 if you have the ANSI C header files. */ -#cmakedefine STDC_HEADERS 1 - /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ #cmakedefine TIME_WITH_SYS_TIME 1 diff --git a/src/trace/trace.h b/src/trace/trace.h index f562e89aa..4bf13123b 100644 --- a/src/trace/trace.h +++ b/src/trace/trace.h @@ -13,9 +13,7 @@ # include "config.h" #endif -#ifdef HAVE_STRING_H # include <string.h> -#endif #include <glibmm/refptr.h> #include <gdkmm/pixbuf.h> diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp index 4d093a4ea..6da1233db 100644 --- a/src/xml/repr-util.cpp +++ b/src/xml/repr-util.cpp @@ -17,13 +17,9 @@ #include "config.h" -#if HAVE_STRING_H # include <cstring> -#endif -#if HAVE_STDLIB_H # include <cstdlib> -#endif #include <glib.h> |
