Attachment 88911 Details for Bug 71405 – Define WIN32_LEAN_AND_MEAN in Windows port

Define WIN32_LEAN_AND_MEAN in Windows port

0001-Define-WIN32_LEAN_AND_MEAN-in-Windows-port.patch (text/plain), 1.18 KB, created by Matt Fischer on 2013-11-08 22:20:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Fischer

Created: 2013-11-08 22:20:43 UTC

Size: 1.18 KB

patch

obsolete

>From d7a72f7816784e30ee25e83da516399111e6a22f Mon Sep 17 00:00:00 2001
>From: Matt Fischer <matt.fischer@garmin.com>
>Date: Fri, 8 Nov 2013 16:08:39 -0600
>Subject: [PATCH] Define WIN32_LEAN_AND_MEAN in Windows port
>
><windows.h> somewhat cloyingly attempts to include <winsock.h>
>by default, which causes problems if the rest of the program
>is trying to use the incompatible <winsock2.h>.  The Windows
>sysdep header attempts to prevent this by forcibly defining
>the winsock header guard macro, so that it will not be included.
>However, this does not work on MinGW because it uses a different
>guard macro name.
>
>This patch changes the code to instead define WIN32_LEAN_AND_MEAN,
>which is a more portable way to ensure that <winsock.h> will not
>be included.
>---
> dbus/dbus-sysdeps-win.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/dbus/dbus-sysdeps-win.h b/dbus/dbus-sysdeps-win.h
>index 90d14de..02e7a83 100644
>--- a/dbus/dbus-sysdeps-win.h
>+++ b/dbus/dbus-sysdeps-win.h
>@@ -27,7 +27,7 @@
> #define DBUS_SYSDEPS_WIN_H
> 
> extern void *_dbus_win_get_dll_hmodule (void);
>-#define _WINSOCKAPI_
>+#define WIN32_LEAN_AND_MEAN
> 
> #include "dbus-hash.h"
> #include "dbus-string.h"
>-- 
>1.8.0.msysgit.0
>

Actions: View

Attachments on bug 71405: 88911

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.