Commit f0605758 authored by Alex Henrie's avatar Alex Henrie Committed by Alexandre Julliard

dinput/tests: Avoid using GCC's typeof extension.

typeof is not available in MSVC.
parent c366fa43
......@@ -48,13 +48,11 @@
#include "windows.gaming.input.forcefeedback.h"
#undef Size
#define MAKE_FUNC(f) static typeof(f) *p ## f
MAKE_FUNC( RoGetActivationFactory );
MAKE_FUNC( RoInitialize );
MAKE_FUNC( WindowsCreateString );
MAKE_FUNC( WindowsDeleteString );
MAKE_FUNC( WindowsGetStringRawBuffer );
#undef MAKE_FUNC
static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** );
static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE );
static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* );
static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str );
static const WCHAR* WINAPI (*pWindowsGetStringRawBuffer)( HSTRING, UINT32* );
static BOOL load_combase_functions(void)
{
......
......@@ -50,12 +50,10 @@
#include "windows.gaming.input.custom.h"
#undef Size
#define MAKE_FUNC(f) static typeof(f) *p ## f
MAKE_FUNC( RoGetActivationFactory );
MAKE_FUNC( RoInitialize );
MAKE_FUNC( WindowsCreateString );
MAKE_FUNC( WindowsDeleteString );
#undef MAKE_FUNC
static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** );
static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE );
static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* );
static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str );
static BOOL load_combase_functions(void)
{
......
......@@ -47,13 +47,11 @@
#include "windows.gaming.input.h"
#undef Size
#define MAKE_FUNC(f) static typeof(f) *p ## f
MAKE_FUNC( RoGetActivationFactory );
MAKE_FUNC( RoInitialize );
MAKE_FUNC( WindowsCreateString );
MAKE_FUNC( WindowsDeleteString );
MAKE_FUNC( WindowsGetStringRawBuffer );
#undef MAKE_FUNC
static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** );
static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE );
static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* );
static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str );
static const WCHAR* WINAPI (*pWindowsGetStringRawBuffer)( HSTRING, UINT32* );
static BOOL load_combase_functions(void)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment