Module: wine Branch: master Commit: 3c3a4740cae7c853451f62653fe2535301fe134b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c3a4740cae7c853451f62653f...
Author: Francois Gouget fgouget@free.fr Date: Thu Dec 15 10:09:39 2011 +0100
include: Add a couple of missing include directives in windows.h.
Rename a variable to avoid a conflict with the Unknown enumeration value. Define WIN32_LEAN_AND_MEAN to avoid conflicts caused by the SetPort macro.
---
dlls/ole32/tests/ole2.c | 5 +++-- dlls/urlmon/tests/uri.c | 1 + include/windows.h | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index f38af3b..6641683 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -20,6 +20,7 @@
#define COBJMACROS #define CONST_VTABLE +#define WIN32_LEAN_AND_MEAN
#include <stdarg.h>
@@ -1841,13 +1842,13 @@ static const IUnknownVtbl UnknownVtbl = Unknown_Release };
-static IUnknown Unknown = { &UnknownVtbl }; +static IUnknown unknown = { &UnknownVtbl };
static void test_OleLockRunning(void) { HRESULT hr;
- hr = OleLockRunning((LPUNKNOWN)&Unknown, TRUE, FALSE); + hr = OleLockRunning((LPUNKNOWN)&unknown, TRUE, FALSE); ok(hr == S_OK, "OleLockRunning failed 0x%08x\n", hr); }
diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index ad63ccf..2332926 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -24,6 +24,7 @@
#define COBJMACROS #define CONST_VTABLE +#define WIN32_LEAN_AND_MEAN
#include "windef.h" #include "winbase.h" diff --git a/include/windows.h b/include/windows.h index 7cd8a83..14f6ce9 100644 --- a/include/windows.h +++ b/include/windows.h @@ -60,7 +60,7 @@ #include <nb30.h> #include <rpc.h> #include <shellapi.h> -/* #include <winperf.h> */ +#include <winperf.h>
#ifndef WINE_NOWINSOCK #include <winsock.h> @@ -69,7 +69,7 @@ #ifndef NOCRYPT #include <wincrypt.h> /* #include <winefs.h> */ -/* #include <winscard.h> */ +#include <winscard.h> #endif /* !NOCRYPT */
#ifndef NOGDI