PATCH: dplayx / new compiler
Marcus Meissner
marcus at jet.franken.de
Sun Jul 11 04:05:55 CDT 2004
Hi,
gcc HEAD errors about mismatch between extern and static definitions, so make
the vtables static and move them to dplay.c.
Ciao, Marcus
Changelog:
Move definitions of static vtables from header to dplay.c.
Index: dlls/dplayx/dplay.c
===================================================================
RCS file: /home/wine/wine/dlls/dplayx/dplay.c,v
retrieving revision 1.48
diff -u -r1.48 dplay.c
--- dlls/dplayx/dplay.c 23 Jan 2004 20:57:26 -0000 1.48
+++ dlls/dplayx/dplay.c 11 Jul 2004 09:04:33 -0000
@@ -76,6 +76,15 @@
LPVOID lpContext );
static void DP_DeleteGroup( IDirectPlay2Impl* This, DPID dpid );
+/* Forward declarations of virtual tables */
+static ICOM_VTABLE(IDirectPlay2) directPlay2AVT;
+static ICOM_VTABLE(IDirectPlay3) directPlay3AVT;
+static ICOM_VTABLE(IDirectPlay4) directPlay4AVT;
+
+static ICOM_VTABLE(IDirectPlay2) directPlay2WVT;
+static ICOM_VTABLE(IDirectPlay3) directPlay3WVT;
+static ICOM_VTABLE(IDirectPlay4) directPlay4WVT;
+
/* Helper methods for player/group interfaces */
static HRESULT WINAPI DP_IF_DeletePlayerFromGroup
( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idGroup,
Index: dlls/dplayx/dplay_global.h
===================================================================
RCS file: /home/wine/wine/dlls/dplayx/dplay_global.h,v
retrieving revision 1.7
diff -u -r1.7 dplay_global.h
--- dlls/dplayx/dplay_global.h 5 Sep 2003 23:08:39 -0000 1.7
+++ dlls/dplayx/dplay_global.h 11 Jul 2004 09:04:33 -0000
@@ -231,16 +231,6 @@
DP_IMPL_FIELDS
};
-/* Forward declarations of virtual tables */
-extern ICOM_VTABLE(IDirectPlay2) directPlay2AVT;
-extern ICOM_VTABLE(IDirectPlay3) directPlay3AVT;
-extern ICOM_VTABLE(IDirectPlay4) directPlay4AVT;
-
-extern ICOM_VTABLE(IDirectPlay2) directPlay2WVT;
-extern ICOM_VTABLE(IDirectPlay3) directPlay3WVT;
-extern ICOM_VTABLE(IDirectPlay4) directPlay4WVT;
-
-
HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpMessageBody,
DWORD dwMessageBodySize, LPCVOID lpMessageHeader,
WORD wCommandId, WORD wVersion,
--
More information about the wine-patches
mailing list