diff --git a/CMakeLists.txt b/CMakeLists.txt index a7aec4d05..17787a171 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -240,7 +240,6 @@ endif () if (UNIX) check_include_file("unistd.h" HAVE_UNISTD_H) check_include_file("fcntl.h" HAVE_FCNTL_H) - check_include_file("stdint.h" HAVE_STDINT_H) file(READ "${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.in" FTCONFIG_H) @@ -254,11 +253,6 @@ if (UNIX) "#undef +(HAVE_FCNTL_H)" "#define \\1 1" FTCONFIG_H "${FTCONFIG_H}") endif () - if (HAVE_STDINT_H) - string(REGEX REPLACE - "#undef +(HAVE_STDINT_H)" "#define \\1 1" - FTCONFIG_H "${FTCONFIG_H}") - endif () string(REPLACE "/undef " "#undef " FTCONFIG_H "${FTCONFIG_H}") else () diff --git a/ChangeLog b/ChangeLog index ccf5744d6..2965ed106 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2020-05-18 David Turner + + Remove obsolete HAVE_STDINT_H probing macro. + + This macro was updated by the unix configure script and the + `CMakeLists.txt' one, but is never used in the source tree (nor is + included anywhere). + + * CMakeLists.txt, builds/unix/ftconfig.in: Don't handle + `HAVE_STDINT_H'. + 2020-05-18 David Turner Remove Jamfile files from the tree. diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in index 7f3737776..a8c7d8acd 100644 --- a/builds/unix/ftconfig.in +++ b/builds/unix/ftconfig.in @@ -56,7 +56,6 @@ FT_BEGIN_HEADER #undef HAVE_UNISTD_H #undef HAVE_FCNTL_H -#undef HAVE_STDINT_H /* There are systems (like the Texas Instruments 'C54x) where a `char` */ /* has 16~bits. ANSI~C says that `sizeof(char)` is always~1. Since an */