Commit 87045eb0 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

Fix rpcndr.h so it takes CONST_VTABLE into account.

Define CONST_VTABLE in the tests that need it. This fixes many Visual C++ warnings.
parent 4b2d7e93
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
*/ */
#define COBJMACROS #define COBJMACROS
#define CONST_VTABLE
#include <wine/test.h> #include <wine/test.h>
#include <stdarg.h> #include <stdarg.h>
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
*/ */
#define COBJMACROS #define COBJMACROS
#define CONST_VTABLE
#include <stdarg.h> #include <stdarg.h>
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#define _WIN32_DCOM #define _WIN32_DCOM
#define COBJMACROS #define COBJMACROS
#define CONST_VTABLE
#include <stdarg.h> #include <stdarg.h>
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
*/ */
#define COBJMACROS #define COBJMACROS
#define CONST_VTABLE
#include <wine/test.h> #include <wine/test.h>
#include <stdarg.h> #include <stdarg.h>
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <stdio.h> #include <stdio.h>
#define COBJMACROS #define COBJMACROS
#define CONST_VTABLE
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
*/ */
#define COBJMACROS #define COBJMACROS
#define CONST_VTABLE
#include <wine/test.h> #include <wine/test.h>
#include <stdarg.h> #include <stdarg.h>
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
*/ */
#define COBJMACROS #define COBJMACROS
#define CONST_VTABLE
#include <wine/test.h> #include <wine/test.h>
#include <stdarg.h> #include <stdarg.h>
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS
#define CONST_VTABLE
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
......
...@@ -30,6 +30,13 @@ extern "C" { ...@@ -30,6 +30,13 @@ extern "C" {
#include <basetsd.h> #include <basetsd.h>
#undef CONST_VTBL
#ifdef CONST_VTABLE
# define CONST_VTBL const
#else
# define CONST_VTBL
#endif
/* stupid #if can't handle casts... this __stupidity /* stupid #if can't handle casts... this __stupidity
is just a workaround for that limitation */ is just a workaround for that limitation */
......
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