Changeset 21479 for trunk/src/ddraw/ddclipper.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/ddclipper.cpp (modified) (2 diffs)

trunk/src/ddraw/ddclipper.cpp

@@ -19 +19 @@
 #include <memory.h>
 #include <stdio.h>
-#define INITGUID
-#define ICOM_CINTERFACE 1
+
 #define CINTERFACE
-
 #include "ddraw2d.h"
 #include "clipper.h"
@@ -59 +57 @@
     else
     {
-        newDDClipper->Vtbl.AddRef((IDirectDrawClipper *)newDDClipper);
+        newDDClipper->Vtbl.fnAddRef((IDirectDrawClipper *)newDDClipper);
 
         rc = newDDClipper->GetLastError();