mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-01 05:54:29 +00:00
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.
This commit is contained in:
parent
3fe2d6e5fd
commit
3c3a4740ca
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
|
||||
#define COBJMACROS
|
||||
#define CONST_VTABLE
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.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
|
||||
|
|
Loading…
Reference in a new issue