Make CONST_VTABLE the default in the Wine source.

2005-07-26 20:10:51 +00:00 · 2005-07-26 20:10:51 +00:00 · 76ed2835cd
parent 89cbfd8fac
commit 76ed2835cd
24 changed files with 4 additions and 46 deletions
--- a/dlls/d3dxof/d3dxof_private.h
+++ b/dlls/d3dxof/d3dxof_private.h
@ -24,8 +24,6 @@
 #ifndef __D3DXOF_PRIVATE_INCLUDED__
 #define __D3DXOF_PRIVATE_INCLUDED__

-#define CONST_VTABLE
-
 #include <stdarg.h>

 #include "windef.h"
--- a/dlls/ddraw/clipper.c
+++ b/dlls/ddraw/clipper.c
@ -24,8 +24,6 @@
 #include <stdlib.h>
 #include <string.h>

-#define CONST_VTABLE
-
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
--- a/dlls/ddraw/ddraw_hal.c
+++ b/dlls/ddraw/ddraw_hal.c
@ -23,8 +23,6 @@
 #include <stdarg.h>
 #include <stdlib.h>

-#define CONST_VTABLE
-
 #include "wine/debug.h"
 #include "windef.h"
 #include "winbase.h"
--- a/dlls/ddraw/ddraw_main.c
+++ b/dlls/ddraw/ddraw_main.c
@ -56,8 +56,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

-#define CONST_VTABLE
-
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
--- a/dlls/ddraw/ddraw_thunks.c
+++ b/dlls/ddraw/ddraw_thunks.c
@ -17,8 +17,6 @@
 */
 #include <stdarg.h>

-#define CONST_VTABLE
-
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
--- a/dlls/ddraw/ddraw_user.c
+++ b/dlls/ddraw/ddraw_user.c
@ -26,8 +26,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

-#define CONST_VTABLE
-
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
--- a/dlls/ddraw/device_opengl.c
+++ b/dlls/ddraw/device_opengl.c
@ -30,8 +30,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

-#define CONST_VTABLE
-
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
--- a/dlls/ddraw/direct3d_opengl.c
+++ b/dlls/ddraw/direct3d_opengl.c
@ -31,8 +31,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

-#define CONST_VTABLE
-
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
--- a/dlls/ddraw/executebuffer.c
+++ b/dlls/ddraw/executebuffer.c
@ -27,8 +27,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

-#define CONST_VTABLE
-
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
--- a/dlls/ddraw/light.c
+++ b/dlls/ddraw/light.c
@ -25,8 +25,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

-#define CONST_VTABLE
-
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
--- a/dlls/ddraw/material.c
+++ b/dlls/ddraw/material.c
@ -25,8 +25,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

-#define CONST_VTABLE
-
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
--- a/dlls/ddraw/palette_hal.c
+++ b/dlls/ddraw/palette_hal.c
@ -24,8 +24,6 @@
 #include <assert.h>
 #include <string.h>

-#define CONST_VTABLE
-
 #include "ddraw_private.h"

 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
--- a/dlls/ddraw/palette_main.c
+++ b/dlls/ddraw/palette_main.c
@ -25,8 +25,6 @@
 #include <assert.h>
 #include <string.h>

-#define CONST_VTABLE
-
 #include "ddraw_private.h"

 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
--- a/dlls/ddraw/surface_dib.c
+++ b/dlls/ddraw/surface_dib.c
@ -28,8 +28,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

-#define CONST_VTABLE
-
 #include "winerror.h"
 #include "wine/debug.h"
 #include "ddraw_private.h"
--- a/dlls/ddraw/surface_fakezbuffer.c
+++ b/dlls/ddraw/surface_fakezbuffer.c
@ -31,8 +31,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

-#define CONST_VTABLE
-
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
--- a/dlls/ddraw/surface_gamma.c
+++ b/dlls/ddraw/surface_gamma.c
@ -23,8 +23,6 @@
 #include <assert.h>
 #include <stdlib.h>

-#define CONST_VTABLE
-
 #include "wine/debug.h"
 #include "ddraw_private.h"

--- a/dlls/ddraw/surface_hal.c
+++ b/dlls/ddraw/surface_hal.c
@ -25,8 +25,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

-#define CONST_VTABLE
-
 #include "wine/debug.h"
 #include "ddraw_private.h"

--- a/dlls/ddraw/surface_main.c
+++ b/dlls/ddraw/surface_main.c
@ -24,8 +24,6 @@
 #include <string.h>

 #define COBJMACROS
-#define CONST_VTABLE
-
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

--- a/dlls/ddraw/surface_thunks.c
+++ b/dlls/ddraw/surface_thunks.c
@ -19,8 +19,6 @@
 #include "config.h"
 #include <stdarg.h>

-#define CONST_VTABLE
-
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
--- a/dlls/ddraw/surface_user.c
+++ b/dlls/ddraw/surface_user.c
@ -23,8 +23,6 @@
 #include <stdlib.h>
 #include <string.h>

-#define CONST_VTABLE
-
 #include "winerror.h"
 #include "wine/debug.h"
 #include "ddraw_private.h"
--- a/dlls/ddraw/texture.c
+++ b/dlls/ddraw/texture.c
@ -26,8 +26,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

-#define CONST_VTABLE
-
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
--- a/dlls/ddraw/vertexbuffer.c
+++ b/dlls/ddraw/vertexbuffer.c
@ -21,8 +21,6 @@
 #include "config.h"
 #include <stdarg.h>

-#define CONST_VTABLE
-
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
--- a/dlls/ddraw/viewport.c
+++ b/dlls/ddraw/viewport.c
@ -25,8 +25,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

-#define CONST_VTABLE
-
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
--- a/include/objbase.h
+++ b/include/objbase.h
@ -246,6 +246,10 @@

 #define interface struct

+#ifdef __WINESRC__
+#define CONST_VTABLE
+#endif
+
 #ifdef CONST_VTABLE
 #undef CONST_VTBL
 #define CONST_VTBL const