include: Remove wine/port.h.

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

dlls/d3d12/d3d12_main.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #define COBJMACROS
 #define VK_NO_PROTOTYPES

dlls/dxgi/adapter.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "dxgi_private.h"
 

dlls/dxgi/device.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "dxgi_private.h"
 

dlls/dxgi/dxgi_main.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #define DXGI_INIT_GUID
 #include "dxgi_private.h"

dlls/dxgi/factory.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "dxgi_private.h"
 

dlls/dxgi/output.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "dxgi_private.h"
 

dlls/dxgi/surface.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "dxgi_private.h"
 

dlls/dxgi/swapchain.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "dxgi_private.h"
 
@@ -29,6 +28,7 @@
 #define VKD3D_NO_WIN32_TYPES
 #ifndef USE_WIN32_VULKAN
 #define WINE_VK_HOST
+#include <dlfcn.h>
 #endif
 #include "wine/vulkan.h"
 #include "wine/vulkan_driver.h"

dlls/dxgi/utils.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "dxgi_private.h"
 

dlls/opengl32/wgl.c

@@ -19,11 +19,11 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 #include <math.h>
 
 #include "windef.h"

dlls/wineandroid.drv/device.c

@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <errno.h>

dlls/wineandroid.drv/init.c

@@ -21,10 +21,10 @@
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <string.h>
+#include <dlfcn.h>
 #include <link.h>
 
 #include "windef.h"

dlls/wineandroid.drv/mmdevdrv.c

@@ -19,7 +19,6 @@
 #define NONAMELESSUNION
 #define COBJMACROS
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <errno.h>
@@ -33,6 +32,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <math.h>
+#include <dlfcn.h>
 
 #include <SLES/OpenSLES.h>
 #include <SLES/OpenSLES_Android.h>

dlls/wineandroid.drv/opengl.c

@@ -25,12 +25,12 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <dlfcn.h>
 #ifdef HAVE_EGL_EGL_H
 #include <EGL/egl.h>
 #endif

dlls/wineandroid.drv/window.c

@@ -24,7 +24,6 @@
 #define NONAMELESSSTRUCT
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <fcntl.h>

dlls/wined3d/adapter_gl.c

@@ -22,7 +22,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 

dlls/wined3d/adapter_vk.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 #include "wine/vulkan_driver.h"

dlls/wined3d/arb_program_shader.c

@@ -28,7 +28,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 

dlls/wined3d/ati_fragment_shader.c

@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 

dlls/wined3d/buffer.c

@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 

dlls/wined3d/context.c

@@ -25,7 +25,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 

dlls/wined3d/context_gl.c

@@ -25,7 +25,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 

dlls/wined3d/context_vk.c

@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 

dlls/wined3d/cs.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

dlls/wined3d/device.c

@@ -25,11 +25,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
-
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
 
 #include "wined3d_private.h"
 

dlls/wined3d/directx.c

@@ -22,7 +22,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 #include "winternl.h"

dlls/wined3d/gl_compat.c

@@ -19,12 +19,8 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
 
 #include "wined3d_private.h"
 

dlls/wined3d/glsl_shader.c

@@ -30,7 +30,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <limits.h>
 #include <stdio.h>

dlls/wined3d/nvidia_texture_shader.c

@@ -19,8 +19,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 

dlls/wined3d/palette.c

@@ -18,8 +18,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

dlls/wined3d/query.c

@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

dlls/wined3d/resource.c

@@ -22,7 +22,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

dlls/wined3d/sampler.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 

dlls/wined3d/shader.c

@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <string.h>

dlls/wined3d/shader_sm1.c

@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 

dlls/wined3d/shader_sm4.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 

dlls/wined3d/shader_spirv.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 
@@ -26,6 +25,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
 #ifdef SONAME_LIBVKD3D_SHADER
 
+#include <dlfcn.h>
 #define VKD3D_SHADER_NO_PROTOTYPES
 #include <vkd3d_shader.h>
 

dlls/wined3d/state.c

@@ -26,12 +26,8 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
 
 #include "wined3d_private.h"
 

dlls/wined3d/stateblock.c

@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

dlls/wined3d/surface.c

@@ -27,7 +27,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

dlls/wined3d/swapchain.c

@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

dlls/wined3d/texture.c

@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

dlls/wined3d/utils.c

@@ -25,7 +25,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 

dlls/wined3d/vertexdeclaration.c

@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl);

dlls/wined3d/view.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "wined3d_private.h"
 #include "wined3d_shaders.h"

dlls/wined3d/wined3d_main.c

@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "initguid.h"
 #include "wined3d_private.h"

dlls/wined3d/wined3d_private.h

@@ -34,6 +34,7 @@
 #include <assert.h>
 #include <stdarg.h>
 #include <stdbool.h>
+#include <sys/types.h>
 #include <math.h>
 #include <limits.h>
 #include "ntstatus.h"

dlls/winejoystick.drv/joystick_linux.c

@@ -36,7 +36,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #ifdef HAVE_LINUX_22_JOYSTICK_API
 

dlls/winemac.drv/opengl.c

@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include "macdrv.h"
 

dlls/winemac.drv/vulkan.c

@@ -22,15 +22,11 @@
  * the other drivers. */
 
 #include "config.h"
-#include "wine/port.h"
-#include "macdrv.h"
 
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "windef.h"
-#include "winbase.h"
-
+#include "macdrv.h"
 #include "wine/debug.h"
 #include "wine/heap.h"
 

dlls/wineoss.drv/midi.c

@@ -40,15 +40,13 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <sys/types.h>
+#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #ifdef HAVE_SYS_IOCTL_H

dlls/wineoss.drv/mmaux.c

@@ -19,14 +19,12 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <sys/types.h>
+#include <unistd.h>
 #include <fcntl.h>
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>

dlls/winex11.drv/clipboard.c

@@ -64,7 +64,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <string.h>
 #include <stdarg.h>
@@ -74,6 +73,7 @@
 # include <unistd.h>
 #endif
 #include <fcntl.h>
+#include <dlfcn.h>
 #include <limits.h>
 #include <time.h>
 #include <assert.h>

dlls/winex11.drv/mouse.c

@@ -20,10 +20,9 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <math.h>
-
+#include <dlfcn.h>
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
 #include <stdarg.h>

dlls/winex11.drv/opengl.c

@@ -24,12 +24,11 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include <dlfcn.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

dlls/winex11.drv/vulkan.c

@@ -21,10 +21,10 @@
  * the other drivers. */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdio.h>
+#include <dlfcn.h>
 
 #include "windef.h"
 #include "winbase.h"

dlls/winex11.drv/window.c

@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdlib.h>

dlls/winex11.drv/wintab.c

@@ -19,11 +19,11 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdlib.h>
 #include <stdarg.h>
 #include <math.h>
+#include <dlfcn.h>
 
 #include "windef.h"
 #include "winbase.h"

dlls/winex11.drv/x11drv_main.c

@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <fcntl.h>
 #include <stdarg.h>
@@ -33,6 +32,7 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+#include <dlfcn.h>
 #include <X11/cursorfont.h>
 #include <X11/Xlib.h>
 #ifdef HAVE_XKB

dlls/winex11.drv/xdnd.c

@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <string.h>
 #ifdef HAVE_UNISTD_H

dlls/winex11.drv/xinerama.c

@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdlib.h>
@@ -27,6 +26,7 @@
 #ifdef HAVE_X11_EXTENSIONS_XINERAMA_H
 #include <X11/extensions/Xinerama.h>
 #endif
+#include <dlfcn.h>
 #include "x11drv.h"
 #include "wine/debug.h"
 #include "wine/heap.h"

dlls/winex11.drv/xrandr.c

@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION
@@ -38,6 +37,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
 #include <assert.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
+#include <dlfcn.h>
 #include "x11drv.h"
 
 #define VK_NO_PROTOTYPES

dlls/winex11.drv/xrender.c

@@ -22,13 +22,14 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>
+#include <dlfcn.h>
 
 #include "windef.h"
 #include "winbase.h"

dlls/winex11.drv/xvidmode.c

@@ -20,12 +20,12 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
+#include <dlfcn.h>
 
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION

include/wine/port.h

@@ -1,69 +0,0 @@
-/*
- * Wine porting definitions
- *
- * Copyright 1996 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __WINE_WINE_PORT_H
-#define __WINE_WINE_PORT_H
-
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
-
-#ifdef __WINE_BASETSD_H
-# error You must include port.h before all other headers
-#endif
-
-#ifdef WINE_UNIX_LIB
-# error port.h should not be used in Unix libraries
-#endif
-
-#include <sys/types.h>
-
-
-/****************************************************************
- * Hard-coded values for the Windows platform
- */
-
-#ifdef _WIN32
-
-#include <errno.h>
-
-#define dlopen(name,flags)   NULL
-#define dlsym(handle,name)   NULL
-static inline int dlclose(void *handle) { return 0; }
-static inline const char *dlerror(void) { return "No dlopen support on Windows"; }
-static inline int symlink(const char *from, const char *to) { errno = ENOSYS; return -1; }
-
-#ifdef _MSC_VER
-/* The UCRT headers in the Windows SDK #error out if we #define snprintf.
- * The C headers that came with previous Visual Studio versions do not have
- * snprintf. Check for VS 2015, which appears to be the first version to
- * use the UCRT headers by default. */
-#if _MSC_VER < 1900
-# define snprintf _snprintf
-#endif
-#endif
-
-#else
-
-#include <dlfcn.h>
-
-#endif  /* _WIN32 */
-
-#endif /* !defined(__WINE_WINE_PORT_H) */

include/winsock2.h

@@ -303,7 +303,6 @@ extern "C" {
 
 /* Constants for WSAPoll() */
 #ifndef USE_WS_PREFIX
-#ifndef __WINE_WINE_PORT_H
 #define POLLERR                    0x0001
 #define POLLHUP                    0x0002
 #define POLLNVAL                   0x0004
@@ -314,7 +313,6 @@ extern "C" {
 #define POLLPRI                    0x0400
 #define POLLIN                     (POLLRDNORM|POLLRDBAND)
 #define POLLOUT                    (POLLWRNORM)
-#endif
 #else
 #define WS_POLLERR                 0x0001
 #define WS_POLLHUP                 0x0002

tools/widl/parser.l

@@ -43,7 +43,6 @@ double	[0-9]+\.[0-9]+([eE][+-]?[0-9]+)*
 %{
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>

tools/wrc/ppl.l

@@ -113,7 +113,6 @@
 
 %top{
 #include "config.h"
-#include "wine/port.h"
 }
 
 /*