Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't bother checking for size_t, mode_t and off_t neither

Browse Source 
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.
This commit is contained in:
Vadim Zeitlin
2021-07-28 21:09:32 +02:00
parent e8975eec72
commit 32d9b0413d
6 changed files with 2 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/cmake/setup.cmake
View File

@@ -646,14 +646,8 @@ if(wxUSE_XLOCALE)
set(CMAKE_EXTRA_INCLUDE_FILES) set(CMAKE_EXTRA_INCLUDE_FILES)
endif() endif()
# Check size and availability of various types # Check sizes of various types
set(SYSTYPES set(SYSTYPES size_t wchar_t int long short)
size_t
wchar_t int long short
)
if(NOT MSVC)
list(APPEND SYSTYPES mode_t off_t)
endif()
foreach(SYSTYPE ${SYSTYPES}) foreach(SYSTYPE ${SYSTYPES})
string(TOUPPER ${SYSTYPE} SYSTYPE_UPPER) string(TOUPPER ${SYSTYPE} SYSTYPE_UPPER)

9
build/cmake/setup.h.in
View File

@@ -17,15 +17,6 @@
/* the installation location prefix from configure */ /* the installation location prefix from configure */
#cmakedefine wxINSTALL_PREFIX "@wxINSTALL_PREFIX@" #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. */ /* Define if ssize_t type is available. */
#cmakedefine HAVE_SSIZE_T #cmakedefine HAVE_SSIZE_T

34
configure vendored
View File

@@ -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" 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 : if test "x$ac_cv_type_ssize_t" = xyes; then :

7
configure.in
View File

@@ -4084,13 +4084,6 @@ dnl ---------------------------------------------------------------------------
dnl Checks for typedefs dnl Checks for typedefs
dnl --------------------------------------------------------------------------- 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 dnl sets HAVE_SSIZE_T if ssize_t is defined
AC_CHECK_TYPES(ssize_t) AC_CHECK_TYPES(ssize_t)

9
setup.h.in
View File

@@ -17,15 +17,6 @@
/* the installation location prefix from configure */ /* the installation location prefix from configure */
#undef wxINSTALL_PREFIX #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. */ /* Define if ssize_t type is available. */
#undef HAVE_SSIZE_T #undef HAVE_SSIZE_T

9
setup.h_vms
View File

@@ -36,15 +36,6 @@
/* Define this to get extra features from GNU libc. */ /* Define this to get extra features from GNU libc. */
#undef _GNU_SOURCE #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 if ssize_t type is available. */
#define HAVE_SSIZE_T 1 #define HAVE_SSIZE_T 1