Skip to content

W
wine-winehq
Commit 82282185 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

include: Don't use idl file for dxgitype.h.

parent a1d55ee7
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 6 deletions
.gitignore
View file @ 82282185
...@@ -171,7 +171,6 @@ include/docobj.h ...@@ -171,7 +171,6 @@ include/docobj.h
include/docobjectservice.h include/docobjectservice.h
include/downloadmgr.h include/downloadmgr.h
include/dxgi.h include/dxgi.h
include/dxgitype.h
include/endpointvolume.h include/endpointvolume.h
include/exdisp.h include/exdisp.h
include/fusion.h include/fusion.h
......
include/Makefile.in
View file @ 82282185
...@@ -32,7 +32,6 @@ PUBLIC_IDL_H_SRCS = \ ...@@ -32,7 +32,6 @@ PUBLIC_IDL_H_SRCS = \
docobjectservice.idl \ docobjectservice.idl \
downloadmgr.idl \ downloadmgr.idl \
dxgi.idl \ dxgi.idl \
dxgitype.idl \
endpointvolume.idl \ endpointvolume.idl \
exdisp.idl \ exdisp.idl \
fusion.idl \ fusion.idl \
...@@ -257,6 +256,7 @@ SRCDIR_INCLUDES = \ ...@@ -257,6 +256,7 @@ SRCDIR_INCLUDES = \
dxerr9.h \ dxerr9.h \
dxfile.h \ dxfile.h \
dxgiformat.h \ dxgiformat.h \
dxgitype.h \
dyngraph.idl \ dyngraph.idl \
errorrep.h \ errorrep.h \
errors.h \ errors.h \
......
include/dxgi.idl
View file @ 82282185
...@@ -16,7 +16,9 @@ ...@@ -16,7 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
import "dxgitype.idl"; import "oaidl.idl";
import "ocidl.idl";
import "dxgitype.h";
const UINT _FACDXGI = 0x87a; const UINT _FACDXGI = 0x87a;
......
include/dxgitype.idl → include/dxgitype.h
View file @ 82282185
...@@ -15,9 +15,11 @@ ...@@ -15,9 +15,11 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
import "oaidl.idl";
import "ocidl.idl"; #ifndef __dxgitype_h__
import "dxgiformat.h"; #define __dxgitype_h__
#include "dxgiformat.h"
typedef struct DXGI_SAMPLE_DESC { typedef struct DXGI_SAMPLE_DESC {
UINT Count; UINT Count;
...@@ -78,3 +80,5 @@ typedef struct DXGI_GAMMA_CONTROL { ...@@ -78,3 +80,5 @@ typedef struct DXGI_GAMMA_CONTROL {
DXGI_RGB Offset; DXGI_RGB Offset;
DXGI_RGB GammaCurve[1025]; DXGI_RGB GammaCurve[1025];
} DXGI_GAMMA_CONTROL; } DXGI_GAMMA_CONTROL;
#endif
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