/pidgin/main: 43b559f9cb68: win32: Update windows API version to...

Changeset: 43b559f9cb684e5502e889082c854bcb2700300c
Author:	 Daniel Atallah <[email protected]>
Date:	 2016-01-05 14:46 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/43b559f9cb68

Description:

win32: Update windows API version to be XP consistently

diffstat:

 libpurple/win32/global.mak                       |  2 +-
 pidgin/plugins/win32/transparency/Makefile.mingw |  1 -
 pidgin/plugins/win32/transparency/win2ktrans.c   |  3 ---
 pidgin/plugins/win32/winprefs/Makefile.mingw     |  1 -
 pidgin/win32/MinimizeToTray.c                    |  1 -
 pidgin/win32/gtkwin32dep.c                       |  3 ---
 pidgin/win32/winpidgin.c                         |  4 ----
 7 files changed, 1 insertions(+), 14 deletions(-)

diffs (85 lines):

diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -86,7 +86,7 @@ ifeq ($(CYRUS_SASL), 1)
 DEFINES += -DHAVE_CYRUS_SASL
 endif
 
-DEFINES += -DHAVE_CONFIG_H -DWIN32_LEAN_AND_MEAN
+DEFINES += -DHAVE_CONFIG_H -DWIN32_LEAN_AND_MEAN -DWINVER=0x0501 -D_WIN32_WINNT=0x501
 
 CFLAGS += -O2 -Wall $(GCCWARNINGS) $(CC_HARDENING_OPTIONS) -pipe -mms-bitfields -g
 
diff --git a/pidgin/plugins/win32/transparency/Makefile.mingw b/pidgin/plugins/win32/transparency/Makefile.mingw
--- a/pidgin/plugins/win32/transparency/Makefile.mingw
+++ b/pidgin/plugins/win32/transparency/Makefile.mingw
@@ -8,7 +8,6 @@ PIDGIN_TREE_TOP := ../../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = win2ktrans
-DEFINES += -D_WIN32_WINNT=0x0500
 
 ##
 ## INCLUDE PATHS
diff --git a/pidgin/plugins/win32/transparency/win2ktrans.c b/pidgin/plugins/win32/transparency/win2ktrans.c
--- a/pidgin/plugins/win32/transparency/win2ktrans.c
+++ b/pidgin/plugins/win32/transparency/win2ktrans.c
@@ -21,9 +21,6 @@
  * 02111-1301, USA.
  *
  */
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0500
-#endif
 #include <gdk/gdkwin32.h>
 #include "internal.h"
 
diff --git a/pidgin/plugins/win32/winprefs/Makefile.mingw b/pidgin/plugins/win32/winprefs/Makefile.mingw
--- a/pidgin/plugins/win32/winprefs/Makefile.mingw
+++ b/pidgin/plugins/win32/winprefs/Makefile.mingw
@@ -9,7 +9,6 @@ include $(PIDGIN_TREE_TOP)/libpurple/win
 
 TARGET = winprefs
 DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
-DEFINES += -DWINVER=0x500
 
 ##
 ## INCLUDE PATHS
diff --git a/pidgin/win32/MinimizeToTray.c b/pidgin/win32/MinimizeToTray.c
--- a/pidgin/win32/MinimizeToTray.c
+++ b/pidgin/win32/MinimizeToTray.c
@@ -14,7 +14,6 @@
  *
  * Copyright 2000 Matthew Ellis <[email protected]>
  */
-#define _WIN32_WINNT 0x0500
 #include <windows.h>
 #include "MinimizeToTray.h"
 
diff --git a/pidgin/win32/gtkwin32dep.c b/pidgin/win32/gtkwin32dep.c
--- a/pidgin/win32/gtkwin32dep.c
+++ b/pidgin/win32/gtkwin32dep.c
@@ -22,9 +22,6 @@
  *
  */
 #define _WIN32_IE 0x500
-#ifndef WINVER
-#define WINVER 0x0500 /* W2K */
-#endif
 #include <windows.h>
 #include <io.h>
 #include <stdlib.h>
diff --git a/pidgin/win32/winpidgin.c b/pidgin/win32/winpidgin.c
--- a/pidgin/win32/winpidgin.c
+++ b/pidgin/win32/winpidgin.c
@@ -25,10 +25,6 @@
  *
  */
 
-/* This is for ATTACH_PARENT_PROCESS */
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x501
-#endif
 #include <windows.h>
 #include <fcntl.h>
 #include <stdlib.h>

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits