Changeset 21479 for trunk/src/ddraw/surfacehlp.cpp

Timestamp:

Nov 27, 2010, 11:27:43 AM (15 years ago)

Author:

dmik

Message:

Get rid of dd_obj_base.h which duplicates obj_base.h creating unnecessary mess (symbol/define duplication) and conflicts when both the DDarw and other COM-related headers are included.

File:

• trunk/src/ddraw/surfacehlp.cpp (modified) (2 diffs)

trunk/src/ddraw/surfacehlp.cpp

@@ -12 +12 @@
                   ( (DWORD)(BYTE)(ch2) << 16 ) | ( (DWORD)(BYTE)(ch3) << 24 ) )
 #include <fourcc.h>
-#define INITGUID
+
+#define CINTERFACE
 #include "ddraw2d.h"
 #include "clipper.h"
@@ -20 +21 @@
 #include "os2util.h"
 #include "rectangle.h"
+
 #include <misc.h>
 #include "asmutil.h"