diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 388de0b56c2..ab9c990c045 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -18,7 +18,6 @@ */ #include "config.h" -#include "wine/port.h" #define COBJMACROS #define VK_NO_PROTOTYPES diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 72f1a2df6b1..e38fef5fa4f 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -18,7 +18,6 @@ */ #include "config.h" -#include "wine/port.h" #include "dxgi_private.h" diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 07773052582..b2635c3f582 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -18,7 +18,6 @@ */ #include "config.h" -#include "wine/port.h" #include "dxgi_private.h" diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 83c3f3734a7..3ac62f6b65c 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -18,7 +18,6 @@ */ #include "config.h" -#include "wine/port.h" #define DXGI_INIT_GUID #include "dxgi_private.h" diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index e3aa554ae85..f57ed7df48f 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -18,7 +18,6 @@ */ #include "config.h" -#include "wine/port.h" #include "dxgi_private.h" diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index f341388766c..bbe394b6556 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -17,7 +17,6 @@ */ #include "config.h" -#include "wine/port.h" #include "dxgi_private.h" diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index ad2c0d7ff1e..663ae30af94 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -18,7 +18,6 @@ */ #include "config.h" -#include "wine/port.h" #include "dxgi_private.h" diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 5df483f2615..209af340136 100644 --- a/dlls/dxgi/swapchain.c +++ b/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 #endif #include "wine/vulkan.h" #include "wine/vulkan_driver.h" diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index af72f83b6b0..35beaa4be1f 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -18,7 +18,6 @@ */ #include "config.h" -#include "wine/port.h" #include "dxgi_private.h" diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index e2b514ffca9..bd7f7d22e98 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -19,11 +19,11 @@ */ #include "config.h" -#include "wine/port.h" #include #include #include +#include #include #include "windef.h" diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 6ddb4b741eb..30bc474ae19 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include #include diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 180a6650ffd..2d7e4469831 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -21,10 +21,10 @@ #define NONAMELESSSTRUCT #define NONAMELESSUNION #include "config.h" -#include "wine/port.h" #include #include +#include #include #include "windef.h" diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 269f93115b7..d6ba1072b9c 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -19,7 +19,6 @@ #define NONAMELESSUNION #define COBJMACROS #include "config.h" -#include "wine/port.h" #include #include @@ -33,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 281f63219af..3d18f99fb1a 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -25,12 +25,12 @@ */ #include "config.h" -#include "wine/port.h" #include #include #include #include +#include #ifdef HAVE_EGL_EGL_H #include #endif diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 480871f3370..c907001c159 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -24,7 +24,6 @@ #define NONAMELESSSTRUCT #include "config.h" -#include "wine/port.h" #include #include diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 85b40b19896..9864093c999 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -22,7 +22,6 @@ */ #include "config.h" -#include "wine/port.h" #include diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f9a31265cd3..c6e7f5d252d 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/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" diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index eeb51448b01..1abc64ccdd1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -28,7 +28,6 @@ */ #include "config.h" -#include "wine/port.h" #include diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 08fb2c81507..3317fdb6b68 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e5bc4c92e6b..2539401bf43 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wined3d_private.h" diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a44e979d32c..ed7fa32f74c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -25,7 +25,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wined3d_private.h" diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index f02a0f400a6..dcb4ab7a0af 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -25,7 +25,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wined3d_private.h" diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 56b2da53060..06162d0c0e8 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wined3d_private.h" diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9bdd2c8ed98..2c94b7aed76 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -17,7 +17,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7fb8a7ec3a6..c516594c269 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -25,11 +25,6 @@ */ #include "config.h" -#include "wine/port.h" - -#ifdef HAVE_FLOAT_H -# include -#endif #include "wined3d_private.h" diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 40567cf1a2c..b2925eb97e9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -22,7 +22,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wined3d_private.h" #include "winternl.h" diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index b8323b7e226..99e7cf0fd0e 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -19,12 +19,8 @@ */ #include "config.h" -#include "wine/port.h" #include -#ifdef HAVE_FLOAT_H -# include -#endif #include "wined3d_private.h" diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 327e73796c8..7983aeddcec 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -30,7 +30,6 @@ */ #include "config.h" -#include "wine/port.h" #include #include diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 10f35e61d59..dacd9031719 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/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 diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 4bc453bde79..506535af1b8 100644 --- a/dlls/wined3d/palette.c +++ b/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); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 1b38eb5e311..864a3b82f0a 100644 --- a/dlls/wined3d/query.c +++ b/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); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index c8fb4cf2e29..94d024ce87d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -22,7 +22,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index bba3165316e..a6259bd3f82 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -18,7 +18,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wined3d_private.h" diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 957710dbd43..24d08a02a38 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include #include diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 0c6bb933174..6dedc83684c 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wined3d_private.h" diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 005be96a51f..80564641eab 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -17,7 +17,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wined3d_private.h" diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index a101b7beb24..1e6a03040b9 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/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 #define VKD3D_SHADER_NO_PROTOTYPES #include diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c76e0c2b604..bc214f73b63 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -26,12 +26,8 @@ */ #include "config.h" -#include "wine/port.h" #include -#ifdef HAVE_FLOAT_H -# include -#endif #include "wined3d_private.h" diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8590a2a1c1f..6d174652b4a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9a5b4cbff72..3309df951dc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -27,7 +27,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3ae698649cf..49a40f3e1d6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -21,7 +21,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f0ef42065d3..851c3c36b82 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -21,7 +21,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b7afa721587..ef2e28b545a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -25,7 +25,6 @@ */ #include "config.h" -#include "wine/port.h" #include diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index a778352d2cf..da5d294ee97 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/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); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 5905a4bcfb5..d6f58309b32 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -18,7 +18,6 @@ */ #include "config.h" -#include "wine/port.h" #include "wined3d_private.h" #include "wined3d_shaders.h" diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index a360eadecc9..699794558d6 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include "initguid.h" #include "wined3d_private.h" diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e1df3d07f99..b30a4108b0b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include "ntstatus.h" diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 4e7e18e9e64..7fd2c95aff1 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -36,7 +36,6 @@ */ #include "config.h" -#include "wine/port.h" #ifdef HAVE_LINUX_22_JOYSTICK_API diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 33132de7415..daf194c2aec 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include "macdrv.h" diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index f546e3ccfa5..3665e0023b7 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -22,15 +22,11 @@ * the other drivers. */ #include "config.h" -#include "wine/port.h" -#include "macdrv.h" #include #include -#include "windef.h" -#include "winbase.h" - +#include "macdrv.h" #include "wine/debug.h" #include "wine/heap.h" diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 553b2ff6ea9..7128d07ec50 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -40,15 +40,13 @@ */ #include "config.h" -#include "wine/port.h" #include #include #include #include -#ifdef HAVE_UNISTD_H -# include -#endif +#include +#include #include #include #ifdef HAVE_SYS_IOCTL_H diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 9554ee72dbc..26fea510eae 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -19,14 +19,12 @@ */ #include "config.h" -#include "wine/port.h" #include #include #include -#ifdef HAVE_UNISTD_H -# include -#endif +#include +#include #include #ifdef HAVE_SYS_IOCTL_H # include diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index b511af3f691..4e3320f8ed5 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -64,7 +64,6 @@ */ #include "config.h" -#include "wine/port.h" #include #include @@ -74,6 +73,7 @@ # include #endif #include +#include #include #include #include diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 8cc30f0736d..9e56e080bda 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -20,10 +20,9 @@ */ #include "config.h" -#include "wine/port.h" #include - +#include #include #include #include diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 791787cfd3a..d46cac58593 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -24,12 +24,11 @@ */ #include "config.h" -#include "wine/port.h" #include #include #include - +#include #ifdef HAVE_SYS_SOCKET_H #include #endif diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 6f67d9a8a19..619b0ecec1e 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -21,10 +21,10 @@ * the other drivers. */ #include "config.h" -#include "wine/port.h" #include #include +#include #include "windef.h" #include "winbase.h" diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b4b7357f245..a9fcfb0e295 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -21,7 +21,6 @@ */ #include "config.h" -#include "wine/port.h" #include #include diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index c141ae88e71..331601c3325 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -19,11 +19,11 @@ */ #include "config.h" -#include "wine/port.h" #include #include #include +#include #include "windef.h" #include "winbase.h" diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index c29d081a0a5..e5592184337 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include #include @@ -33,6 +32,7 @@ #ifdef HAVE_UNISTD_H # include #endif +#include #include #include #ifdef HAVE_XKB diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 9eee4bee1ac..b72a168adce 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include #ifdef HAVE_UNISTD_H diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 5794bcb4f74..b707574a0ab 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include #include @@ -27,6 +26,7 @@ #ifdef HAVE_X11_EXTENSIONS_XINERAMA_H #include #endif +#include #include "x11drv.h" #include "wine/debug.h" #include "wine/heap.h" diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 561ef9e506a..fb7a4405a1e 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/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 #include #include +#include #include "x11drv.h" #define VK_NO_PROTOTYPES diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ac19af79e10..5e5e83489f4 100644 --- a/dlls/winex11.drv/xrender.c +++ b/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 #include #include #include +#include #include "windef.h" #include "winbase.h" diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 79cf2e32dc5..d0be58342a5 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -20,12 +20,12 @@ */ #include "config.h" -#include "wine/port.h" #include #include #include #include +#include #define NONAMELESSSTRUCT #define NONAMELESSUNION diff --git a/include/wine/port.h b/include/wine/port.h deleted file mode 100644 index 0405b8d63ad..00000000000 --- a/include/wine/port.h +++ /dev/null @@ -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 - - -/**************************************************************** - * Hard-coded values for the Windows platform - */ - -#ifdef _WIN32 - -#include - -#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 - -#endif /* _WIN32 */ - -#endif /* !defined(__WINE_WINE_PORT_H) */ diff --git a/include/winsock2.h b/include/winsock2.h index abc82554d8e..f1d43acad40 100644 --- a/include/winsock2.h +++ b/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 diff --git a/tools/widl/parser.l b/tools/widl/parser.l index d01a9ece3bb..6070d7e7a1f 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -43,7 +43,6 @@ double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* %{ #include "config.h" -#include "wine/port.h" #include #include diff --git a/tools/wrc/ppl.l b/tools/wrc/ppl.l index ee5a4f97a1e..632bb61a665 100644 --- a/tools/wrc/ppl.l +++ b/tools/wrc/ppl.l @@ -113,7 +113,6 @@ %top{ #include "config.h" -#include "wine/port.h" } /*