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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 82282185a99598da4f743d57dd946f2f01c82845
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=82282185a99598da4f743d57dd...

Author: Jacek Caban 
Date:   Sat Jun 18 15:08:08 2011 +0200

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

---

.gitignore                           |    1 -
 include/Makefile.in                  |    2 +-
 include/dxgi.idl                     |    4 +++-
 include/{dxgitype.idl => dxgitype.h} |   10 +++++++---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 711a35d..6f999e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -171,7 +171,6 @@ include/docobj.h
 include/docobjectservice.h
 include/downloadmgr.h
 include/dxgi.h
-include/dxgitype.h
 include/endpointvolume.h
 include/exdisp.h
 include/fusion.h
diff --git a/include/Makefile.in b/include/Makefile.in
index 7326dee..383b674 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -32,7 +32,6 @@ PUBLIC_IDL_H_SRCS = \
    docobjectservice.idl \
    downloadmgr.idl \
    dxgi.idl \
-	dxgitype.idl \
    endpointvolume.idl \
    exdisp.idl \
    fusion.idl \
@@ -257,6 +256,7 @@ SRCDIR_INCLUDES = \
    dxerr9.h \
    dxfile.h \
    dxgiformat.h \
+	dxgitype.h \
    dyngraph.idl \
    errorrep.h \
    errors.h \
diff --git a/include/dxgi.idl b/include/dxgi.idl
index 8652a2c..6f36a56 100644
--- a/include/dxgi.idl
+++ b/include/dxgi.idl
@@ -16,7 +16,9 @@
  * 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;

diff --git a/include/dxgitype.idl b/include/dxgitype.h
similarity index 96%
rename from include/dxgitype.idl
rename to include/dxgitype.h
index 276881d..e89e055 100644
--- a/include/dxgitype.idl
+++ b/include/dxgitype.h
@@ -15,9 +15,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-import "oaidl.idl";
-import "ocidl.idl";
-import "dxgiformat.h";
+
+#ifndef __dxgitype_h__
+#define __dxgitype_h__
+
+#include "dxgiformat.h"

typedef struct DXGI_SAMPLE_DESC {
     UINT Count;
@@ -78,3 +80,5 @@ typedef struct DXGI_GAMMA_CONTROL {
     DXGI_RGB Offset;
     DXGI_RGB GammaCurve[1025];
 } DXGI_GAMMA_CONTROL;
+
+#endif