mirror of https://github.com/GNOME/gimp.git
Get rid of old Windows specific defines
MINGW64 - uses 0x601 as value for _WIN32_WINNT. No need for us to define it to that value or even lower values in some places. This also gets rid of: warning: "_WIN32_WINNT" redefined - has 0x0502 for WINVER, so get rid of us setting it to 0x0500 in gimp-app-test-utils.h. It also seems that the need to use G_OS_WIN32 has disappeared here. - DIRECTINPUT_VERSION is 0x0800, no need for us to set it to that value. - AI_ADDRCONFIG was apparently missing from the MINGW headers in the past, but not anymore.
This commit is contained in:
parent
be1259de2b
commit
f78186e03b
|
@ -33,9 +33,7 @@
|
|||
#include <glib.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#define _WIN32_WINNT 0x0500
|
||||
#include <windows.h>
|
||||
#include <process.h>
|
||||
#endif
|
||||
|
||||
#include <cairo.h>
|
||||
|
|
|
@ -74,13 +74,6 @@
|
|||
#include "unique.h"
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
/* To get PROCESS_DEP_* defined we need _WIN32_WINNT at 0x0601. We still
|
||||
* use the API optionally only if present, though.
|
||||
*/
|
||||
#ifdef _WIN32_WINNT
|
||||
#undef _WIN32_WINNT
|
||||
#endif
|
||||
#define _WIN32_WINNT 0x0601
|
||||
#include <windows.h>
|
||||
#include <conio.h>
|
||||
#endif
|
||||
|
|
|
@ -40,16 +40,6 @@
|
|||
|
||||
#include "gimp-app-test-utils.h"
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
/* SendInput() requirement is Windows 2000 pro or over.
|
||||
* We may need to set WINVER to make sure the compiler does not try to
|
||||
* compile for on older version of win32, thus breaking the build.
|
||||
* See
|
||||
* http://msdn.microsoft.com/en-us/library/aa383745%28v=vs.85%29.aspx#setting_winver_or__win32_winnt
|
||||
*/
|
||||
#define WINVER 0x0500
|
||||
#include <windows.h>
|
||||
#endif /* G_OS_WIN32 */
|
||||
|
||||
#ifdef GDK_WINDOWING_QUARTZ
|
||||
// only to get keycode definitions from HIToolbox/Events.h
|
||||
|
|
|
@ -43,11 +43,6 @@
|
|||
# endif
|
||||
# define STRICT
|
||||
|
||||
# ifdef _WIN32_WINNT
|
||||
# undef _WIN32_WINNT
|
||||
# endif
|
||||
# define _WIN32_WINNT 0x0601
|
||||
|
||||
# include <windows.h>
|
||||
# include <tlhelp32.h>
|
||||
# include <processthreadsapi.h>
|
||||
|
|
|
@ -51,11 +51,6 @@
|
|||
# endif
|
||||
# define STRICT
|
||||
|
||||
# ifdef _WIN32_WINNT
|
||||
# undef _WIN32_WINNT
|
||||
# endif
|
||||
# define _WIN32_WINNT 0x0601
|
||||
|
||||
# include <windows.h>
|
||||
# include <tlhelp32.h>
|
||||
# undef RGB
|
||||
|
|
|
@ -75,11 +75,6 @@
|
|||
# endif
|
||||
# define STRICT
|
||||
|
||||
# ifdef _WIN32_WINNT
|
||||
# undef _WIN32_WINNT
|
||||
# endif
|
||||
# define _WIN32_WINNT 0x0601
|
||||
|
||||
# include <windows.h>
|
||||
# include <tlhelp32.h>
|
||||
# undef RGB
|
||||
|
|
|
@ -37,10 +37,6 @@
|
|||
#endif
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#ifdef _WIN32_WINNT
|
||||
#undef _WIN32_WINNT
|
||||
#endif
|
||||
#define _WIN32_WINNT 0x0600
|
||||
#include <windows.h>
|
||||
#include <icm.h>
|
||||
#endif
|
||||
|
|
|
@ -33,9 +33,7 @@
|
|||
#include <string.h>
|
||||
#include <math.h>
|
||||
|
||||
#define _WIN32_WINNT 0x0501
|
||||
#include <windows.h>
|
||||
#define DIRECTINPUT_VERSION 0x0800
|
||||
#include <dinput.h>
|
||||
|
||||
#include <gegl.h>
|
||||
|
|
|
@ -27,9 +27,7 @@
|
|||
#include <gtk/gtk.h>
|
||||
|
||||
#ifdef HAVE_DX_DINPUT
|
||||
#define _WIN32_WINNT 0x0501
|
||||
#include <windows.h>
|
||||
#define DIRECTINPUT_VERSION 0x0800
|
||||
#include <dinput.h>
|
||||
#include <rpc.h>
|
||||
|
||||
|
|
|
@ -31,14 +31,6 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
/* Necessary in order to have SetProcessDPIAware() defined.
|
||||
* This value of _WIN32_WINNT corresponds to Windows 7, which is our
|
||||
* minimum supported platform.
|
||||
*/
|
||||
#ifdef _WIN32_WINNT
|
||||
#undef _WIN32_WINNT
|
||||
#endif
|
||||
#define _WIN32_WINNT 0x0601
|
||||
#include <windows.h>
|
||||
|
||||
#include <libgimp/gimp.h>
|
||||
|
|
|
@ -61,21 +61,11 @@
|
|||
#include <glib.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#ifdef _WIN32_WINNT
|
||||
#undef _WIN32_WINNT
|
||||
#endif
|
||||
#define _WIN32_WINNT 0x0502
|
||||
#include <winsock2.h>
|
||||
#include <ws2tcpip.h>
|
||||
|
||||
typedef short sa_family_t; /* Not defined by winsock */
|
||||
|
||||
#ifndef AI_ADDRCONFIG
|
||||
/* Missing from mingw headers, but value is publicly documented
|
||||
* on http://msdn.microsoft.com/en-us/library/ms737530%28v=VS.85%29.aspx
|
||||
*/
|
||||
#define AI_ADDRCONFIG 0x0400
|
||||
#endif
|
||||
#include <libgimpbase/gimpwin32-io.h>
|
||||
#else
|
||||
#include <sys/socket.h>
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
*/
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define _WIN32_WINNT 0x0502
|
||||
#include <windows.h>
|
||||
#include <tchar.h>
|
||||
#include <tlhelp32.h>
|
||||
|
|
Loading…
Reference in New Issue