Only define _WIN32_WINNT if not already defined. (cherry picked from commit 98bb07181...

author Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>

Sat, 28 Mar 2009 23:47:42 +0000 (00:47 +0100)

committer Ralf Habacker <ralf.habacker@freenet.de>

Mon, 30 Nov 2009 11:00:18 +0000 (12:00 +0100)
author Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>
Sat, 28 Mar 2009 23:47:42 +0000 (00:47 +0100)
committer Ralf Habacker <ralf.habacker@freenet.de>
Mon, 30 Nov 2009 11:00:18 +0000 (12:00 +0100)
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c

index ab71981f9e83bdc33ec01162df65dd2c6aeee980..ade8044f2b9062d8f3cf951f3c6c1b5f49940e8a 100644 (file)
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -31,8 +31,10 @@
  #define STRSAFE_NO_DEPRECATE
  
  #ifndef DBUS_WINCE
+#ifndef _WIN32_WINNT
  #define _WIN32_WINNT 0x0501
  #endif
+#endif
  
  #include "dbus-internals.h"
  #include "dbus-sysdeps.h"
author	Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>
	Sat, 28 Mar 2009 23:47:42 +0000 (00:47 +0100)
committer	Ralf Habacker <ralf.habacker@freenet.de>
	Mon, 30 Nov 2009 11:00:18 +0000 (12:00 +0100)