From 06f6637363295b6ac9ddd1718358968d09db88d2 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard <julliard@winehq.org> Date: Tue, 19 Oct 2021 18:58:36 +0200 Subject: [PATCH] libwine: Avoid including wine/port.h. Signed-off-by: Alexandre Julliard <julliard@winehq.org> --- libs/wine/config.c | 7 +++---- libs/wine/debug.c | 7 +++---- libs/wine/ldt.c | 3 ++- libs/wine/loader.c | 6 ++---- libs/wine/mmap.c | 5 +---- libs/wine/port.c | 1 - 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index b8f1bd5f86d..cb42421c168 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wine/asm.h" #ifdef __ASM_OBSOLETE @@ -29,10 +28,10 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#include <sys/types.h> #include <sys/stat.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> +#include <dlfcn.h> #ifdef HAVE_PWD_H #include <pwd.h> #endif diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 95e6fe6e58c..9cb918d272d 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wine/asm.h" #ifdef __ASM_OBSOLETE @@ -29,9 +28,9 @@ #include <stdarg.h> #include <string.h> #include <ctype.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> #include "wine/debug.h" diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 18b0b9be9bf..3fc1c0cb3d8 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -20,14 +20,15 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdlib.h> #include <stdarg.h> #include <stdio.h> #include <string.h> +#include <sys/types.h> #include <errno.h> +#include <unistd.h> #include "windef.h" #include "winbase.h" diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 4245beea94b..edb6e37061d 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> @@ -35,9 +34,8 @@ #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> +#include <dlfcn.h> #ifdef __APPLE__ #include <crt_externs.h> diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index b72d2af20d3..86b25b0a7ac 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> @@ -35,9 +34,7 @@ #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #ifdef HAVE_STDINT_H # include <stdint.h> #endif diff --git a/libs/wine/port.c b/libs/wine/port.c index ee804f414a0..b019e1d2fd4 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wine/asm.h" #ifdef __ASM_OBSOLETE -- GitLab