Changeset 21479 for trunk/include


Ignore:
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.

Location:
trunk/include/win
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/d3d.h

    r4133 r21479  
    3636typedef struct IDirect3DDevice        IDirect3DDevice, *LPDIRECT3DDEVICE;
    3737typedef struct IDirect3DDevice2       IDirect3DDevice2, *LPDIRECT3DDEVICE2;
    38 typedef struct IDirect3DViewport2     IDirect3DViewport, IDirect3DViewport2, *LPDIRECT3DVIEWPORT2, *LPDIRECT3DVIEWPORT;
    39 typedef struct IDirect3DMaterial2     IDirect3DMaterial, *LPDIRECT3DMATERIAL, IDirect3DMaterial2, *LPDIRECT3DMATERIAL2;
    40 typedef struct IDirect3DTexture2      IDirect3DTexture, *LPDIRECT3DTEXTURE, IDirect3DTexture2,  *LPDIRECT3DTEXTURE2;
     38typedef struct IDirect3DViewport      IDirect3DViewport, *LPDIRECT3DVIEWPORT;
     39typedef struct IDirect3DViewport2     IDirect3DViewport2, *LPDIRECT3DVIEWPORT2;
     40typedef struct IDirect3DMaterial      IDirect3DMaterial, *LPDIRECT3DMATERIAL;
     41typedef struct IDirect3DMaterial2     IDirect3DMaterial2, *LPDIRECT3DMATERIAL2;
     42typedef struct IDirect3DTexture       IDirect3DTexture, *LPDIRECT3DTEXTURE;
     43typedef struct IDirect3DTexture2      IDirect3DTexture2,  *LPDIRECT3DTEXTURE2;
    4144typedef struct IDirect3DExecuteBuffer IDirect3DExecuteBuffer, *LPDIRECT3DEXECUTEBUFFER;
    4245

  • trunk/include/win/ddraw.h

    r4133 r21479  
    77  #include "wingdi.h" /* PALETTE stuff ... */
    88#ifndef __WINE_OBJBASE_H
    9   #include "wine/dd_obj_base.h"
     9  #include "wine/obj_base.h"
    1010#endif
    1111
Note: See TracChangeset for help on using the changeset viewer.