Alexandre Julliard : configure: Remove some no longer needed configure checks.

Alexandre Julliard julliard at winehq.org
Tue Dec 1 15:40:33 CST 2020


Module: wine
Branch: master
Commit: c8edeb132da3fb196d430f5ab5d09a9399605547
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c8edeb132da3fb196d430f5ab5d09a9399605547

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Dec  1 10:23:42 2020 +0100

configure: Remove some no longer needed configure checks.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 configure           | 24 ------------------------
 configure.ac        | 16 ----------------
 include/config.h.in | 33 ---------------------------------
 include/wine/port.h | 10 ----------
 4 files changed, 83 deletions(-)

diff --git a/configure b/configure
index 283cac2f979..9ee3ffdc947 100755
--- a/configure
+++ b/configure
@@ -7390,7 +7390,6 @@ for ac_header in \
 	Carbon/Carbon.h \
 	CommonCrypto/CommonCryptor.h \
 	CoreAudio/CoreAudio.h \
-	CoreServices/CoreServices.h \
 	DiskArbitration/DiskArbitration.h \
 	EGL/egl.h \
 	IOKit/IOKitLib.h \
@@ -7422,7 +7421,6 @@ for ac_header in \
 	libproc.h \
 	link.h \
 	linux/cdrom.h \
-	linux/compiler.h \
 	linux/filter.h \
 	linux/hdreg.h \
 	linux/hidraw.h \
@@ -7435,10 +7433,8 @@ for ac_header in \
 	linux/types.h \
 	linux/ucdrom.h \
 	lwp.h \
-	mach-o/nlist.h \
 	mach-o/loader.h \
 	mach/mach.h \
-	mach/machine.h \
 	machine/cpu.h \
 	machine/sysarch.h \
 	mntent.h \
@@ -7457,7 +7453,6 @@ for ac_header in \
 	scsi/scsi.h \
 	scsi/scsi_ioctl.h \
 	scsi/sg.h \
-	stdbool.h \
 	stdint.h \
 	stropts.h \
 	sys/attr.h \
@@ -17775,16 +17770,12 @@ for ac_func in \
 	pread \
 	proc_pidinfo \
 	pwrite \
-	readdir \
 	readlink \
 	sched_yield \
 	setproctitle \
 	setprogname \
-	settimeofday \
 	sigprocmask \
-	strtold \
 	symlink \
-	sysinfo \
 	tcdrain \
 	thr_kill2
 
@@ -18093,7 +18084,6 @@ fi
 for ac_func in \
 	getaddrinfo \
 	getnameinfo \
-	getnetbyname \
 	getservbyport \
 
 do :
@@ -18689,20 +18679,6 @@ $as_echo "#define HAVE_LINUX_22_JOYSTICK_API 1" >>confdefs.h
    fi
 fi
 
-ac_fn_c_check_member "$LINENO" "struct dirent" "d_reclen" "ac_cv_member_struct_dirent_d_reclen" "#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-"
-if test "x$ac_cv_member_struct_dirent_d_reclen" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_DIRENT_D_RECLEN 1
-_ACEOF
-
-
-fi
-
-
 ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_accrights" "ac_cv_member_struct_msghdr_msg_accrights" "#include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
diff --git a/configure.ac b/configure.ac
index 853f99e8b1c..92b555bb3b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -417,7 +417,6 @@ AC_CHECK_HEADERS(\
 	Carbon/Carbon.h \
 	CommonCrypto/CommonCryptor.h \
 	CoreAudio/CoreAudio.h \
-	CoreServices/CoreServices.h \
 	DiskArbitration/DiskArbitration.h \
 	EGL/egl.h \
 	IOKit/IOKitLib.h \
@@ -449,7 +448,6 @@ AC_CHECK_HEADERS(\
 	libproc.h \
 	link.h \
 	linux/cdrom.h \
-	linux/compiler.h \
 	linux/filter.h \
 	linux/hdreg.h \
 	linux/hidraw.h \
@@ -462,10 +460,8 @@ AC_CHECK_HEADERS(\
 	linux/types.h \
 	linux/ucdrom.h \
 	lwp.h \
-	mach-o/nlist.h \
 	mach-o/loader.h \
 	mach/mach.h \
-	mach/machine.h \
 	machine/cpu.h \
 	machine/sysarch.h \
 	mntent.h \
@@ -484,7 +480,6 @@ AC_CHECK_HEADERS(\
 	scsi/scsi.h \
 	scsi/scsi_ioctl.h \
 	scsi/sg.h \
-	stdbool.h \
 	stdint.h \
 	stropts.h \
 	sys/attr.h \
@@ -2184,16 +2179,12 @@ AC_CHECK_FUNCS(\
 	pread \
 	proc_pidinfo \
 	pwrite \
-	readdir \
 	readlink \
 	sched_yield \
 	setproctitle \
 	setprogname \
-	settimeofday \
 	sigprocmask \
-	strtold \
 	symlink \
-	sysinfo \
 	tcdrain \
 	thr_kill2
 )
@@ -2222,7 +2213,6 @@ dnl **** Check for functions which may rely on -lsocket on Solaris.
 AC_CHECK_FUNCS(\
 	getaddrinfo \
 	getnameinfo \
-	getnetbyname \
 	getservbyport \
 )
 
@@ -2395,12 +2385,6 @@ then
    fi
 fi
 
-dnl Check for dirent.d_reclen
-AC_CHECK_MEMBERS([struct dirent.d_reclen],,,
-[#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif])
-
 dnl Check for socket structure members
 AC_CHECK_MEMBERS([struct msghdr.msg_accrights, struct sockaddr.sa_len, struct sockaddr_un.sun_len],,,
 [#include <sys/types.h>
diff --git a/include/config.h.in b/include/config.h.in
index 0bed21d9cea..c0d90c48677 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -85,9 +85,6 @@
 /* Define to 1 if you have the <CoreAudio/CoreAudio.h> header file. */
 #undef HAVE_COREAUDIO_COREAUDIO_H
 
-/* Define to 1 if you have the <CoreServices/CoreServices.h> header file. */
-#undef HAVE_CORESERVICES_CORESERVICES_H
-
 /* Define to 1 if you have the <cups/cups.h> header file. */
 #undef HAVE_CUPS_CUPS_H
 
@@ -219,9 +216,6 @@
 /* Define to 1 if you have the `getnameinfo' function. */
 #undef HAVE_GETNAMEINFO
 
-/* Define to 1 if you have the `getnetbyname' function. */
-#undef HAVE_GETNETBYNAME
-
 /* Define to 1 if you have the <getopt.h> header file. */
 #undef HAVE_GETOPT_H
 
@@ -417,9 +411,6 @@
 /* Define to 1 if you have the <linux/cdrom.h> header file. */
 #undef HAVE_LINUX_CDROM_H
 
-/* Define to 1 if you have the <linux/compiler.h> header file. */
-#undef HAVE_LINUX_COMPILER_H
-
 /* Define to 1 if you have the <linux/filter.h> header file. */
 #undef HAVE_LINUX_FILTER_H
 
@@ -519,18 +510,12 @@
 /* Define to 1 if you have the `mach_continuous_time' function. */
 #undef HAVE_MACH_CONTINUOUS_TIME
 
-/* Define to 1 if you have the <mach/machine.h> header file. */
-#undef HAVE_MACH_MACHINE_H
-
 /* Define to 1 if you have the <mach/mach.h> header file. */
 #undef HAVE_MACH_MACH_H
 
 /* Define to 1 if you have the <mach-o/loader.h> header file. */
 #undef HAVE_MACH_O_LOADER_H
 
-/* Define to 1 if you have the <mach-o/nlist.h> header file. */
-#undef HAVE_MACH_O_NLIST_H
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -690,9 +675,6 @@
 /* Define to 1 if you have the <QuickTime/ImageCompression.h> header file. */
 #undef HAVE_QUICKTIME_IMAGECOMPRESSION_H
 
-/* Define to 1 if you have the `readdir' function. */
-#undef HAVE_READDIR
-
 /* Define to 1 if you have the `readlink' function. */
 #undef HAVE_READLINK
 
@@ -768,9 +750,6 @@
 /* Define to 1 if you have the `setprogname' function. */
 #undef HAVE_SETPROGNAME
 
-/* Define to 1 if you have the `settimeofday' function. */
-#undef HAVE_SETTIMEOFDAY
-
 /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
 #undef HAVE_SG_IO_HDR_T_INTERFACE_ID
 
@@ -789,9 +768,6 @@
 /* Define to 1 if you have the `SSLCopyPeerCertificates' function. */
 #undef HAVE_SSLCOPYPEERCERTIFICATES
 
-/* Define to 1 if you have the <stdbool.h> header file. */
-#undef HAVE_STDBOOL_H
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -807,12 +783,6 @@
 /* Define to 1 if you have the <stropts.h> header file. */
 #undef HAVE_STROPTS_H
 
-/* Define to 1 if you have the `strtold' function. */
-#undef HAVE_STRTOLD
-
-/* Define to 1 if `d_reclen' is a member of `struct dirent'. */
-#undef HAVE_STRUCT_DIRENT_D_RECLEN
-
 /* Define to 1 if `direction' is a member of `struct ff_effect'. */
 #undef HAVE_STRUCT_FF_EFFECT_DIRECTION
 
@@ -921,9 +891,6 @@
 /* Define to 1 if you have the <syscall.h> header file. */
 #undef HAVE_SYSCALL_H
 
-/* Define to 1 if you have the `sysinfo' function. */
-#undef HAVE_SYSINFO
-
 /* Define to 1 if you have the
    <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h> header file. */
 #undef HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H
diff --git a/include/wine/port.h b/include/wine/port.h
index fec72120ec6..b1354395ca9 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -62,7 +62,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows";
 
 #ifdef _MSC_VER
 
-#define ftruncate chsize
 #define popen _popen
 #define pclose _pclose
 /* The UCRT headers in the Windows SDK #error out if we #define snprintf.
@@ -77,7 +76,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows";
 #define strncasecmp _strnicmp
 #define strcasecmp _stricmp
 
-typedef int mode_t;
 typedef long off_t;
 typedef int pid_t;
 typedef int ssize_t;
@@ -124,10 +122,6 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]);
 # define S_ISLNK(mod) (0)
 #endif
 
-#ifndef S_ISSOCK
-# define S_ISSOCK(mod) (0)
-#endif
-
 #ifndef S_ISDIR
 # define S_ISDIR(mod) (((mod) & _S_IFMT) == _S_IFDIR)
 #endif
@@ -136,10 +130,6 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]);
 # define S_ISCHR(mod) (((mod) & _S_IFMT) == _S_IFCHR)
 #endif
 
-#ifndef S_ISFIFO
-# define S_ISFIFO(mod) (((mod) & _S_IFMT) == _S_IFIFO)
-#endif
-
 #ifndef S_ISREG
 # define S_ISREG(mod) (((mod) & _S_IFMT) == _S_IFREG)
 #endif




More information about the wine-cvs mailing list