Skip to content

W
wine-cw
Commit 2a8bd72f authored by Ove Kaaven's avatar Ove Kaaven Committed by Alexandre Julliard
Browse files
Options

Merge the rest of include/wine/obj_base.h into include/objbase.h.

parent d2c034a8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 9 deletions
include/Makefile.in
View file @ 2a8bd72f
...@@ -203,7 +203,6 @@ WINE_INCLUDES = \ ...@@ -203,7 +203,6 @@ WINE_INCLUDES = \
debug.h \ debug.h \
exception.h \ exception.h \
library.h \ library.h \
obj_base.h \
obj_cache.h \ obj_cache.h \
obj_comcat.h \ obj_comcat.h \
obj_commdlgbrowser.h \ obj_commdlgbrowser.h \
......
include/unknwn.h
View file @ 2a8bd72f
...@@ -8,9 +8,6 @@ ...@@ -8,9 +8,6 @@
extern "C" { extern "C" {
#endif #endif
#include "wtypes.h" #include "wtypes.h"
#define __WINE_INCLUDE_UNKNWN
#include "wine/obj_base.h"
#undef __WINE_INCLUDE_UNKNWN
#if defined(__cplusplus) && !defined(CINTERFACE) #if defined(__cplusplus) && !defined(CINTERFACE)
#ifdef ICOM_USE_COM_INTERFACE_ATTRIBUTE #ifdef ICOM_USE_COM_INTERFACE_ATTRIBUTE
#define ICOM_COM_INTERFACE_ATTRIBUTE __attribute__((com_interface)) #define ICOM_COM_INTERFACE_ATTRIBUTE __attribute__((com_interface))
......
include/unknwn.idl
View file @ 2a8bd72f
...@@ -18,11 +18,6 @@ ...@@ -18,11 +18,6 @@
import "wtypes.idl"; import "wtypes.idl";
/* need this until objidl.h and objbase.h is complete */
cpp_quote("#define __WINE_INCLUDE_UNKNWN")
cpp_quote("#include \"wine/obj_base.h\"")
cpp_quote("#undef __WINE_INCLUDE_UNKNWN")
/* COM vtable compatibility macros for g++ */ /* COM vtable compatibility macros for g++ */
/* Included here because the generated header needs them */ /* Included here because the generated header needs them */
......
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