PATCH: shdocvw gcc4

[Marcus Meissner]

Hi,

make shdocvw build with gcc4.

Ciao, Marcus

Changelog:
	Move static variables out of header file, also
	the local interface implementations.

Index: dlls/shdocvw/events.c
===================================================================
RCS file: /home/wine/wine/dlls/shdocvw/events.c,v
retrieving revision 1.14
diff -u -r1.14 events.c
--- dlls/shdocvw/events.c	6 Jun 2005 19:50:36 -0000	1.14
+++ dlls/shdocvw/events.c	11 Jun 2005 08:01:40 -0000
@@ -27,6 +27,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
+static IConnectionPointImpl SHDOCVW_ConnectionPoint;
 
 static const GUID IID_INotifyDBEvents =
     { 0xdb526cc0, 0xd188, 0x11cd, { 0xad, 0x48, 0x00, 0xaa, 0x00, 0x3c, 0x9c, 0xb6 } };
Index: dlls/shdocvw/oleobject.c
===================================================================
RCS file: /home/wine/wine/dlls/shdocvw/oleobject.c,v
retrieving revision 1.13
diff -u -r1.13 oleobject.c
--- dlls/shdocvw/oleobject.c	6 Jun 2005 19:50:36 -0000	1.13
+++ dlls/shdocvw/oleobject.c	11 Jun 2005 08:01:41 -0000
@@ -30,6 +30,30 @@
 WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 /**********************************************************************
+ * IOleControl declaration for SHDOCVW.DLL
+ */
+typedef struct
+{
+    /* IUnknown fields */
+    const IOleControlVtbl *lpVtbl;
+    DWORD ref;
+} IOleControlImpl;
+
+static IOleControlImpl SHDOCVW_OleControl;
+
+/**********************************************************************
+ * IOleInPlaceObject declaration for SHDOCVW.DLL
+ */
+typedef struct
+{
+    /* IUnknown fields */
+    const IOleInPlaceObjectVtbl *lpVtbl;
+    DWORD ref;
+} IOleInPlaceObjectImpl;
+
+static IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject;
+
+/**********************************************************************
  * Implement the IOleObject interface for the web browser component
  *
  * Based on DefaultHandler code in dlls/ole32/defaulthandler.c.
Index: dlls/shdocvw/shdocvw.h
===================================================================
RCS file: /home/wine/wine/dlls/shdocvw/shdocvw.h,v
retrieving revision 1.12
diff -u -r1.12 shdocvw.h
--- dlls/shdocvw/shdocvw.h	6 Jun 2005 19:50:36 -0000	1.12
+++ dlls/shdocvw/shdocvw.h	11 Jun 2005 08:01:41 -0000
@@ -60,33 +60,6 @@
 
 extern IOleObjectImpl SHDOCVW_OleObject;
 
-
-/**********************************************************************
- * IOleInPlaceObject declaration for SHDOCVW.DLL
- */
-typedef struct
-{
-    /* IUnknown fields */
-    const IOleInPlaceObjectVtbl *lpVtbl;
-    DWORD ref;
-} IOleInPlaceObjectImpl;
-
-extern IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject;
-
-
-/**********************************************************************
- * IOleControl declaration for SHDOCVW.DLL
- */
-typedef struct
-{
-    /* IUnknown fields */
-    const IOleControlVtbl *lpVtbl;
-    DWORD ref;
-} IOleControlImpl;
-
-extern IOleControlImpl SHDOCVW_OleControl;
-
-
 /**********************************************************************
  * IWebBrowser declaration for SHDOCVW.DLL
  */
@@ -187,8 +160,6 @@
     const IConnectionPointVtbl *lpVtbl;
     DWORD ref;
 } IConnectionPointImpl;
-
-extern IConnectionPointImpl SHDOCVW_ConnectionPoint;
 
 /**********************************************************************
  * Dll lifetime tracking declaration for shdocvw.dll
--