Alexandre Julliard : ntdll: Avoid including wine/port.h.
Alexandre Julliard
julliard at winehq.org
Wed Oct 20 15:58:40 CDT 2021
Module: wine
Branch: master
Commit: 832724282bc1bc4f59e06d4978ff807e433a1ac5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=832724282bc1bc4f59e06d4978ff807e433a1ac5
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Oct 19 18:39:13 2021 +0200
ntdll: Avoid including wine/port.h.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/unix/cdrom.c | 10 +++-------
dlls/ntdll/unix/debug.c | 8 ++++----
dlls/ntdll/unix/file.c | 8 ++------
dlls/ntdll/unix/loader.c | 11 +++++++----
dlls/ntdll/unix/process.c | 5 +----
dlls/ntdll/unix/serial.c | 9 ++-------
dlls/ntdll/unix/server.c | 10 +++-------
dlls/ntdll/unix/signal_arm.c | 6 ++----
dlls/ntdll/unix/signal_arm64.c | 6 ++----
dlls/ntdll/unix/signal_i386.c | 5 +----
dlls/ntdll/unix/signal_x86_64.c | 5 +----
dlls/ntdll/unix/sync.c | 7 +++----
dlls/ntdll/unix/system.c | 5 ++++-
dlls/ntdll/unix/tape.c | 5 ++++-
dlls/ntdll/unix/thread.c | 3 ++-
dlls/ntdll/unix/virtual.c | 13 ++++++-------
16 files changed, 47 insertions(+), 69 deletions(-)
diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c
index 479d4058068..db3b9cd25c2 100644
--- a/dlls/ntdll/unix/cdrom.c
+++ b/dlls/ntdll/unix/cdrom.c
@@ -26,19 +26,15 @@
#endif
#include "config.h"
-#include "wine/port.h"
#include <errno.h>
#include <string.h>
#include <stdarg.h>
#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <stdlib.h>
+#include <unistd.h>
#include <fcntl.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
#ifdef MAJOR_IN_MKDEV
# include <sys/mkdev.h>
#elif defined(MAJOR_IN_SYSMACROS)
diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c
index a2a63b5a9f4..26e7decc059 100644
--- a/dlls/ntdll/unix/debug.c
+++ b/dlls/ntdll/unix/debug.c
@@ -23,16 +23,16 @@
#endif
#include "config.h"
-#include "wine/port.h"
#include <assert.h>
+#include <fcntl.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 7e47e32bab9..1acd999a3c5 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -25,7 +25,6 @@
#endif
#include "config.h"
-#include "wine/port.h"
#include <assert.h>
#include <sys/types.h>
@@ -37,15 +36,12 @@
#include <stdlib.h>
#include <stdio.h>
#include <limits.h>
+#include <unistd.h>
#ifdef HAVE_MNTENT_H
#include <mntent.h>
#endif
-#ifdef HAVE_POLL_H
#include <poll.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
#ifdef HAVE_SYS_STATVFS_H
# include <sys/statvfs.h>
#endif
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index df309814c0c..4e807744862 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -23,17 +23,20 @@
#endif
#include "config.h"
-#include "wine/port.h"
#include <assert.h>
#include <errno.h>
+#include <fcntl.h>
#include <stdarg.h>
#include <stdio.h>
#include <signal.h>
#include <math.h>
-#ifdef HAVE_LINK_H
-# include <link.h>
-#endif
+#include <string.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <dlfcn.h>
#ifdef HAVE_PWD_H
# include <pwd.h>
#endif
diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c
index b35765ba2fe..10a88db9291 100644
--- a/dlls/ntdll/unix/process.c
+++ b/dlls/ntdll/unix/process.c
@@ -24,7 +24,6 @@
#endif
#include "config.h"
-#include "wine/port.h"
#include <errno.h>
#include <fcntl.h>
@@ -47,9 +46,7 @@
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#ifdef HAVE_MACH_MACH_H
# include <mach/mach.h>
#endif
diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c
index ab2ef9330a5..ece9966f12b 100644
--- a/dlls/ntdll/unix/serial.c
+++ b/dlls/ntdll/unix/serial.c
@@ -25,7 +25,6 @@
#endif
#include "config.h"
-#include "wine/port.h"
#include <errno.h>
#include <string.h>
@@ -35,13 +34,9 @@
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#include <fcntl.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
#include <sys/types.h>
#ifdef HAVE_SYS_FILIO_H
# include <sys/filio.h>
diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
index 53d34e1858a..46d403df326 100644
--- a/dlls/ntdll/unix/server.c
+++ b/dlls/ntdll/unix/server.c
@@ -23,7 +23,6 @@
#endif
#include "config.h"
-#include "wine/port.h"
#include <assert.h>
#include <ctype.h>
@@ -41,6 +40,7 @@
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#ifdef HAVE_SYS_SOCKET_H
@@ -58,9 +58,7 @@
#ifdef HAVE_SYS_PRCTL_H
# include <sys/prctl.h>
#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
#ifdef HAVE_SYS_SYSCALL_H
# include <sys/syscall.h>
#endif
@@ -70,9 +68,7 @@
#ifdef HAVE_SYS_THR_H
#include <sys/thr.h>
#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#ifdef __APPLE__
#include <crt_externs.h>
#include <spawn.h>
diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c
index 88f0f4ff76d..798d7b9cc87 100644
--- a/dlls/ntdll/unix/signal_arm.c
+++ b/dlls/ntdll/unix/signal_arm.c
@@ -26,7 +26,6 @@
#ifdef __arm__
#include "config.h"
-#include "wine/port.h"
#include <assert.h>
#include <pthread.h>
@@ -34,9 +33,8 @@
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <sys/types.h>
+#include <unistd.h>
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c
index ce7e1689434..0f72bf3c89d 100644
--- a/dlls/ntdll/unix/signal_arm64.c
+++ b/dlls/ntdll/unix/signal_arm64.c
@@ -25,7 +25,6 @@
#ifdef __aarch64__
#include "config.h"
-#include "wine/port.h"
#include <assert.h>
#include <pthread.h>
@@ -33,9 +32,8 @@
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <sys/types.h>
+#include <unistd.h>
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index c38c4d046d7..bf3abc1a587 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -25,7 +25,6 @@
#ifdef __i386__
#include "config.h"
-#include "wine/port.h"
#include <errno.h>
#include <signal.h>
@@ -34,9 +33,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <assert.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index a99cf2ae9c1..0085bd42410 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -25,7 +25,6 @@
#ifdef __x86_64__
#include "config.h"
-#include "wine/port.h"
#include <assert.h>
#include <pthread.h>
@@ -35,9 +34,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <sys/mman.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#ifdef HAVE_MACHINE_SYSARCH_H
# include <machine/sysarch.h>
#endif
diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
index 86a836a908f..a246fc19618 100644
--- a/dlls/ntdll/unix/sync.c
+++ b/dlls/ntdll/unix/sync.c
@@ -26,12 +26,13 @@
#endif
#include "config.h"
-#include "wine/port.h"
#include <assert.h>
#include <errno.h>
+#include <fcntl.h>
#include <limits.h>
#include <signal.h>
+#include <sys/types.h>
#ifdef HAVE_SYS_SYSCALL_H
#include <sys/syscall.h>
#endif
@@ -44,9 +45,7 @@
#ifdef HAVE_SYS_POLL_H
# include <sys/poll.h>
#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#ifdef HAVE_SCHED_H
# include <sched.h>
#endif
diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c
index 82c9f0da492..c4853568599 100644
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -23,12 +23,15 @@
#endif
#include "config.h"
-#include "wine/port.h"
+#include <fcntl.h>
#include <string.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
#include <errno.h>
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
diff --git a/dlls/ntdll/unix/tape.c b/dlls/ntdll/unix/tape.c
index 6824d42a745..741de2f6d95 100644
--- a/dlls/ntdll/unix/tape.c
+++ b/dlls/ntdll/unix/tape.c
@@ -23,11 +23,14 @@
#endif
#include "config.h"
-#include "wine/port.h"
#include <stdarg.h>
#include <stdio.h>
#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index 384ac1d4119..38a03bd4b60 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -23,17 +23,18 @@
#endif
#include "config.h"
-#include "wine/port.h"
#include <assert.h>
#include <errno.h>
#include <limits.h>
#include <stdarg.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <pthread.h>
#include <signal.h>
#include <sys/types.h>
+#include <unistd.h>
#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
#endif
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 6db08de6473..facecffcf37 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -23,29 +23,28 @@
#endif
#include "config.h"
-#include "wine/port.h"
#include <assert.h>
#include <errno.h>
+#include <fcntl.h>
#include <stdarg.h>
#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
#include <signal.h>
#include <sys/types.h>
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
#ifdef HAVE_SYS_MMAN_H
# include <sys/mman.h>
#endif
#ifdef HAVE_SYS_SYSINFO_H
# include <sys/sysinfo.h>
#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
+#include <dlfcn.h>
#ifdef HAVE_VALGRIND_VALGRIND_H
# include <valgrind/valgrind.h>
#endif
More information about the wine-cvs
mailing list