Changeset 21494 for trunk/src/ddraw


Ignore:
Timestamp:
Dec 2, 2010, 1:19:12 AM (15 years ago)
Author:
dmik
Message:

Fixed broken build after r21492 by sorting out a huuuuge wagon of duplicates, wrong include order and other dirty mess.

Location:
trunk/src/ddraw
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/ddraw/clipper.cpp

    r21483 r21494  
    2020#include <memory.h>
    2121
    22 #ifndef CINTERFACE
    23 #define CINTERFACE 1
    24 #endif
     22#define CINTERFACE
    2523#include "ddraw2d.h"
    2624#include "clipper.h"

  • trunk/src/ddraw/ddclipper.cpp

    r21483 r21494  
    2020#include <stdio.h>
    2121
    22 #ifndef CINTERFACE
    23 #define CINTERFACE 1
    24 #endif
     22#define CINTERFACE
    2523#include "ddraw2d.h"
    2624#include "clipper.h"

  • trunk/src/ddraw/ddmain.cpp

    r21483 r21494  
    2323#include <stdio.h>
    2424
    25 #ifndef CINTERFACE
    26 #define CINTERFACE 1
    27 #endif
     25#define CINTERFACE
    2826#include "ddraw2d.h"
    2927#include "winerror.h"

  • trunk/src/ddraw/ddraw2d.cpp

    r21483 r21494  
    2222#include <winuser32.h>
    2323
    24 #ifndef CINTERFACE
    25 #define CINTERFACE 1
    26 #endif
     24#define CINTERFACE
    2725#define INITGUID
    2826#include "ddraw2d.h"

  • trunk/src/ddraw/ddraw3d.cpp

    r21483 r21494  
    2020#include <winbase.h>
    2121
    22 #ifndef CINTERFACE
    23 #define CINTERFACE 1
    24 #endif
     22#define CINTERFACE
    2523#include "ddraw2d.h"
    2624#include "clipper.h"

  • trunk/src/ddraw/new/ddraw.CPP

    r4970 r21494  
    1818#include <builtin.h>
    1919#define INITGUID
    20 #define ICOM_CINTERFACE 1
    2120#define CINTERFACE
    2221

  • trunk/src/ddraw/palette.cpp

    r21483 r21494  
    2121#include <memory.h>
    2222
    23 #ifndef CINTERFACE
    24 #define CINTERFACE 1
    25 #endif
     23#define CINTERFACE
    2624#include "ddraw2d.h"
    2725#include "clipper.h"

  • trunk/src/ddraw/surface.cpp

    r21483 r21494  
    2525#include <fourcc.h>
    2626
    27 #ifndef CINTERFACE
    28 #define CINTERFACE 1
    29 #endif
     27#define CINTERFACE
    3028#include "ddraw2d.h"
    3129#include "clipper.h"

  • trunk/src/ddraw/surfacehlp.cpp

    r21483 r21494  
    1313#include <fourcc.h>
    1414
    15 #ifndef CINTERFACE
    16 #define CINTERFACE 1
    17 #endif
     15#define CINTERFACE
    1816#include "ddraw2d.h"
    1917#include "clipper.h"

  • trunk/src/ddraw/surfblit.cpp

    r21483 r21494  
    2525#include <fourcc.h>
    2626
    27 #ifndef CINTERFACE
    28 #define CINTERFACE 1
    29 #endif
     27#define CINTERFACE
    3028#include "ddraw2d.h"
    3129#include "clipper.h"

  • trunk/src/ddraw/surfoverlay.cpp

    r21483 r21494  
    2525#include <fourcc.h>
    2626
    27 #ifndef CINTERFACE
    28 #define CINTERFACE 1
    29 #endif
     27#define CINTERFACE
    3028#include "ddraw2d.h"
    3129#include "clipper.h"
Note: See TracChangeset for help on using the changeset viewer.