From 32d9b0413d572d2d6f6e310275d15d467fd862f1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 28 Jul 2021 21:09:32 +0200
Subject: [PATCH] Don't bother checking for size_t, mode_t and off_t neither

The latter two are always defined in sys/types.h on all Unix systems and
we already define them for MSVC (which doesn't use configure anyhow).

The former type is always defined everywhere.
---
 build/cmake/setup.cmake | 10 ++--------
 build/cmake/setup.h.in  |  9 ---------
 configure               | 34 ----------------------------------
 configure.in            |  7 -------
 setup.h.in              |  9 ---------
 setup.h_vms             |  9 ---------
 6 files changed, 2 insertions(+), 76 deletions(-)

diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake
index 972f37fbb7..d294178203 100644
--- a/build/cmake/setup.cmake
+++ b/build/cmake/setup.cmake
@@ -646,14 +646,8 @@ if(wxUSE_XLOCALE)
     set(CMAKE_EXTRA_INCLUDE_FILES)
 endif()
 
-# Check size and availability of various types
-set(SYSTYPES
-    size_t
-    wchar_t int long short
-    )
-if(NOT MSVC)
-    list(APPEND SYSTYPES mode_t off_t)
-endif()
+# Check sizes of various types
+set(SYSTYPES size_t wchar_t int long short)
 
 foreach(SYSTYPE ${SYSTYPES})
     string(TOUPPER ${SYSTYPE} SYSTYPE_UPPER)
diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in
index 7601b511a2..d91c0811e2 100644
--- a/build/cmake/setup.h.in
+++ b/build/cmake/setup.h.in
@@ -17,15 +17,6 @@
 /* the installation location prefix from configure */
 #cmakedefine wxINSTALL_PREFIX "@wxINSTALL_PREFIX@"
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#cmakedefine mode_t int
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-#cmakedefine off_t long
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#cmakedefine size_t unsigned
-
 /* Define if ssize_t type is available.  */
 #cmakedefine HAVE_SSIZE_T
 
diff --git a/configure b/configure
index 26f5bf4f5f..e76a56a6e1 100755
--- a/configure
+++ b/configure
@@ -29735,40 +29735,6 @@ WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_u
 
 
 
-ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define mode_t int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define off_t long int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-
 ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
 if test "x$ac_cv_type_ssize_t" = xyes; then :
 
diff --git a/configure.in b/configure.in
index e28342bafb..12cae2fd01 100644
--- a/configure.in
+++ b/configure.in
@@ -4084,13 +4084,6 @@ dnl ---------------------------------------------------------------------------
 dnl Checks for typedefs
 dnl ---------------------------------------------------------------------------
 
-dnl   defines mode_t if not already defined
-AC_TYPE_MODE_T
-dnl   defines off_t if not already defined
-AC_TYPE_OFF_T
-dnl   defines size_t if not already defined
-AC_TYPE_SIZE_T
-
 dnl sets HAVE_SSIZE_T if ssize_t is defined
 AC_CHECK_TYPES(ssize_t)
 
diff --git a/setup.h.in b/setup.h.in
index ea18824f28..75c02fb407 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -17,15 +17,6 @@
 /* the installation location prefix from configure */
 #undef wxINSTALL_PREFIX
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef mode_t
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-#undef off_t
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
-
 /* Define if ssize_t type is available.  */
 #undef HAVE_SSIZE_T
 
diff --git a/setup.h_vms b/setup.h_vms
index 5e547653c5..aa63876e8e 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -36,15 +36,6 @@
 /* Define this to get extra features from GNU libc. */
 #undef _GNU_SOURCE
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef mode_t
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-#undef off_t
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
-
 /* Define if ssize_t type is available.  */
 #define HAVE_SSIZE_T 1