diff --git a/.github/workflows/data/expat_config_h_cmake__expected.txt b/.github/workflows/data/expat_config_h_cmake__expected.txt index 9e8910b0..9b1a4605 100644 --- a/.github/workflows/data/expat_config_h_cmake__expected.txt +++ b/.github/workflows/data/expat_config_h_cmake__expected.txt @@ -27,7 +27,6 @@ PACKAGE_STRING PACKAGE_TARNAME PACKAGE_URL PACKAGE_VERSION -size_t STDC_HEADERS WORDS_BIGENDIAN XML_ATTR_INFO diff --git a/.github/workflows/data/expat_config_h_in__expected.txt b/.github/workflows/data/expat_config_h_in__expected.txt index f89b54f5..1e438930 100644 --- a/.github/workflows/data/expat_config_h_in__expected.txt +++ b/.github/workflows/data/expat_config_h_in__expected.txt @@ -31,7 +31,6 @@ PACKAGE_STRING PACKAGE_TARNAME PACKAGE_URL PACKAGE_VERSION -size_t STDC_HEADERS VERSION WORDS_BIGENDIAN diff --git a/expat/ConfigureChecks.cmake b/expat/ConfigureChecks.cmake index 3fc732f0..eca61fc2 100644 --- a/expat/ConfigureChecks.cmake +++ b/expat/ConfigureChecks.cmake @@ -46,12 +46,18 @@ else(WORDS_BIGENDIAN) endif(WORDS_BIGENDIAN) if(HAVE_SYS_TYPES_H) - check_symbol_exists("off_t" "sys/types.h" off_t) - check_symbol_exists("size_t" "sys/types.h" size_t) -else(HAVE_SYS_TYPES_H) + check_c_source_compiles(" + #include + int main(void) { + const off_t offset = -123; + return 0; + }" + HAVE_OFF_T) +endif() + +if(NOT HAVE_OFF_T) set(off_t "long") - set(size_t "unsigned") -endif(HAVE_SYS_TYPES_H) +endif() check_c_source_compiles(" #include /* for NULL */ diff --git a/expat/configure.ac b/expat/configure.ac index 04415e36..6860e880 100644 --- a/expat/configure.ac +++ b/expat/configure.ac @@ -160,7 +160,6 @@ AC_C_BIGENDIAN([AC_DEFINE([WORDS_BIGENDIAN], 1) AC_DEFINE_UNQUOTED([BYTEORDER], $BYTEORDER, [1234 = LILENDIAN, 4321 = BIGENDIAN]) AC_C_CONST -AC_TYPE_SIZE_T AC_ARG_WITH([xmlwf], [AS_HELP_STRING([--without-xmlwf], [do not build xmlwf])], diff --git a/expat/expat_config.h.cmake b/expat/expat_config.h.cmake index ceb9b4ec..43df67ae 100644 --- a/expat/expat_config.h.cmake +++ b/expat/expat_config.h.cmake @@ -119,7 +119,4 @@ /* Define to `long' if does not define. */ #cmakedefine off_t @off_t@ -/* Define to `unsigned' if does not define. */ -#cmakedefine size_t @size_t@ - #endif // ndef EXPAT_CONFIG_H