Jacek Caban : include: Make some include guards compatible with MS headers.
Alexandre Julliard
julliard at winehq.org
Mon Feb 21 10:56:59 CST 2011
Module: wine
Branch: master
Commit: 6ef4e780274e1b7a4cec4d32733bbf497eeb4135
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef4e780274e1b7a4cec4d32733bbf497eeb4135
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Feb 21 13:00:07 2011 +0100
include: Make some include guards compatible with MS headers.
This is for compatibility with mingw-w64.
---
include/ddraw.h | 6 +++---
include/ddrawi.h | 6 +++---
include/ddstream.idl | 2 +-
include/dinput.h | 6 +++---
include/dsound.h | 6 +++---
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/ddraw.h b/include/ddraw.h
index 88990f0..3eef218 100644
--- a/include/ddraw.h
+++ b/include/ddraw.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#ifndef __WINE_DDRAW_H
-#define __WINE_DDRAW_H
+#ifndef __DDRAW_INCLUDED__
+#define __DDRAW_INCLUDED__
#define COM_NO_WINDOWS_H
#include <objbase.h>
@@ -2678,4 +2678,4 @@ HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,IUnknown*);
} /* extern "C" */
#endif /* defined(__cplusplus) */
-#endif /* __WINE_DDRAW_H */
+#endif /* __DDRAW_INCLUDED__ */
diff --git a/include/ddrawi.h b/include/ddrawi.h
index 4e3c9e3..a695a1c 100644
--- a/include/ddrawi.h
+++ b/include/ddrawi.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#ifndef __WINE_DDRAWI_H
-#define __WINE_DDRAWI_H
+#ifndef __DDRAWI_INCLUDED__
+#define __DDRAWI_INCLUDED__
#include <ddraw.h>
#include <dciddi.h> /* the DD HAL is layered onto DCI escapes */
@@ -1067,4 +1067,4 @@ typedef struct _DDRAWI_DDRAWPALETTE_LCL {
} /* extern "C" */
#endif
-#endif /* __WINE_DDRAWI_H */
+#endif /* __DDRAWI_INCLUDED__ */
diff --git a/include/ddstream.idl b/include/ddstream.idl
index 947e2bc..e2ad466 100644
--- a/include/ddstream.idl
+++ b/include/ddstream.idl
@@ -19,7 +19,7 @@
import "unknwn.idl";
import "mmstream.idl";
-cpp_quote("#ifndef __WINE_DDRAW_H")
+cpp_quote("#ifndef __DDRAW_INCLUDED__")
typedef void * LPDDSURFACEDESC;
typedef struct tDDSURFACEDESC DDSURFACEDESC;
interface IDirectDraw;
diff --git a/include/dinput.h b/include/dinput.h
index ac3aaba..c52a1b7 100644
--- a/include/dinput.h
+++ b/include/dinput.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#ifndef __WINE_DINPUT_H
-#define __WINE_DINPUT_H
+#ifndef __DINPUT_INCLUDED__
+#define __DINPUT_INCLUDED__
#define COM_NO_WINDOWS_H
#include <objbase.h>
@@ -2298,4 +2298,4 @@ HRESULT WINAPI DirectInputCreateEx(HINSTANCE,DWORD,REFIID,LPVOID *,LPUNKNOWN);
};
#endif
-#endif /* __WINE_DINPUT_H */
+#endif /* __DINPUT_INCLUDED__ */
diff --git a/include/dsound.h b/include/dsound.h
index dc1ead3..372fabf 100644
--- a/include/dsound.h
+++ b/include/dsound.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#ifndef __WINE_DSOUND_H
-#define __WINE_DSOUND_H
+#ifndef __DSOUND_INCLUDED__
+#define __DSOUND_INCLUDED__
#ifndef DIRECTSOUND_VERSION
#define DIRECTSOUND_VERSION 0x0900
@@ -1194,4 +1194,4 @@ DECLARE_INTERFACE_(IDirectSoundFullDuplex,IUnknown)
} /* extern "C" */
#endif /* defined(__cplusplus) */
-#endif /* __WINE_DSOUND_H */
+#endif /* __DSOUND_INCLUDED__ */
More information about the wine-cvs
mailing list