Skip to content

W
wine-winehq
Commit 4021f5cc authored by Robert Riggs's avatar Robert Riggs Committed by Alexandre Julliard
Browse files
Options

include ddraw.h, questionable fix for questionable struct/union

construct in MS's D3DVECTOR definition.
parent 88bd9809
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
include/d3d.h
View file @ 4021f5cc
#ifndef _WINE_D3D_H
#define _WINE_D3D_H
#include "ddraw.h"
typedef LPVOID LPDIRECT3DMATERIAL,LPDIRECT3DVIEWPORT;
typedef LPVOID LPDIRECT3DMATERIAL2,LPDIRECT3DVIEWPORT2;
typedef LPVOID LPDIRECT3DDEVICE2;
......@@ -277,6 +279,8 @@ typedef float D3DVALUE,*LPD3DVALUE;
#define D3DDivide(a, b) (float)((double) (a) / (double) (b))
#define D3DMultiply(a, b) ((a) * (b))
#if 0
// This causes lots o' problems
typedef struct {
union {
D3DVALUE x;
......@@ -292,7 +296,13 @@ typedef struct {
} z;
/* the c++ variant has operator overloads etc. too */
} D3DVECTOR,*LPD3DVECTOR;
#endif
typedef struct _D3DVECTOR {
D3DVALUE x;
D3DVALUE y;
D3DVALUE z;
} D3DVECTOR,*LPD3DVECTOR;
typedef enum {
D3DLIGHT_POINT = 1,
......
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