configure: Hardcode some types for Windows platforms.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Alexandre Julliard 2019-03-13 17:12:36 +01:00
parent 667bc336fe
commit 4d4c55d061
4 changed files with 17 additions and 93 deletions

54
configure vendored
View File

@ -17471,60 +17471,6 @@ _ACEOF
;;
esac
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 :
cat >>confdefs.h <<_ACEOF
#define HAVE_MODE_T 1
_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 :
cat >>confdefs.h <<_ACEOF
#define HAVE_OFF_T 1
_ACEOF
fi
ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
if test "x$ac_cv_type_pid_t" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PID_T 1
_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 :
cat >>confdefs.h <<_ACEOF
#define HAVE_SIZE_T 1
_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 :
cat >>confdefs.h <<_ACEOF
#define HAVE_SSIZE_T 1
_ACEOF
fi
ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default"
if test "x$ac_cv_type_long_long" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LONG_LONG 1
_ACEOF
fi
ac_fn_c_check_type "$LINENO" "fsblkcnt_t" "ac_cv_type_fsblkcnt_t" "$ac_includes_default"
if test "x$ac_cv_type_fsblkcnt_t" = xyes; then :

View File

@ -2312,7 +2312,7 @@ fi
dnl **** Check for types ****
AC_C_INLINE
AC_CHECK_TYPES([mode_t, off_t, pid_t, size_t, ssize_t, long long, fsblkcnt_t, fsfilcnt_t])
AC_CHECK_TYPES([fsblkcnt_t, fsfilcnt_t])
AC_CHECK_TYPES([sigset_t],,,[#include <sys/types.h>
#include <signal.h>])
AC_CHECK_TYPES([request_sense],,,[#include <linux/cdrom.h>])

View File

@ -549,9 +549,6 @@
/* Define to 1 if you have the `log2f' function. */
#undef HAVE_LOG2F
/* Define to 1 if the system has the type `long long'. */
#undef HAVE_LONG_LONG
/* Define to 1 if you have the `lrint' function. */
#undef HAVE_LRINT
@ -606,9 +603,6 @@
/* Define to 1 if you have the <mntent.h> header file. */
#undef HAVE_MNTENT_H
/* Define to 1 if the system has the type `mode_t'. */
#undef HAVE_MODE_T
/* Define to 1 if you have the `mousemask' function. */
#undef HAVE_MOUSEMASK
@ -699,9 +693,6 @@
/* Define to 1 if `_msg_ptr' is a member of `ns_msg'. */
#undef HAVE_NS_MSG__MSG_PTR
/* Define to 1 if the system has the type `off_t'. */
#undef HAVE_OFF_T
/* Define if mkdir takes only one argument */
#undef HAVE_ONE_ARG_MKDIR
@ -723,9 +714,6 @@
/* Define to 1 if you have the `pclose' function. */
#undef HAVE_PCLOSE
/* Define to 1 if the system has the type `pid_t'. */
#undef HAVE_PID_T
/* Define to 1 if you have the `pipe2' function. */
#undef HAVE_PIPE2
@ -891,18 +879,12 @@
/* Define to 1 if the system has the type `sigset_t'. */
#undef HAVE_SIGSET_T
/* Define to 1 if the system has the type `size_t'. */
#undef HAVE_SIZE_T
/* Define to 1 if you have the `snprintf' function. */
#undef HAVE_SNPRINTF
/* Define to 1 if you have the `socketpair' function. */
#undef HAVE_SOCKETPAIR
/* Define to 1 if the system has the type `ssize_t'. */
#undef HAVE_SSIZE_T
/* Define to 1 if you have the `SSLCopyPeerCertificates' function. */
#undef HAVE_SSLCOPYPEERCERTIFICATES

View File

@ -53,13 +53,18 @@
#include <io.h>
#include <process.h>
#endif /* _WIN32 */
#ifdef _MSC_VER
/****************************************************************
* Type definitions
*/
typedef int mode_t;
typedef long off_t;
typedef int pid_t;
typedef int ssize_t;
#if !defined(_MSC_VER) && !defined(__int64)
#endif /* _MSC_VER */
#else /* _WIN32 */
#ifndef __int64
# if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64)
# define __int64 long
# else
@ -67,21 +72,12 @@
# endif
#endif
#ifndef HAVE_MODE_T
typedef int mode_t;
#endif
#ifndef HAVE_OFF_T
typedef long off_t;
#endif
#ifndef HAVE_PID_T
typedef int pid_t;
#endif
#ifndef HAVE_SIZE_T
typedef unsigned int size_t;
#endif
#ifndef HAVE_SSIZE_T
typedef int ssize_t;
#endif
#endif /* _WIN32 */
/****************************************************************
* Type definitions
*/
#ifndef HAVE_FSBLKCNT_T
typedef unsigned long fsblkcnt_t;
#endif