Skip to content

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

include: Make some include guards compatible with MS headers.

This is for compatibility with mingw-w64.
parent 62c8c143
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
include/ddraw.h
View file @ 6ef4e780
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef __WINE_DDRAW_H #ifndef __DDRAW_INCLUDED__
#define __WINE_DDRAW_H #define __DDRAW_INCLUDED__
#define COM_NO_WINDOWS_H #define COM_NO_WINDOWS_H
#include <objbase.h> #include <objbase.h>
...@@ -2678,4 +2678,4 @@ HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,IUnknown*); ...@@ -2678,4 +2678,4 @@ HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,IUnknown*);
} /* extern "C" */ } /* extern "C" */
#endif /* defined(__cplusplus) */ #endif /* defined(__cplusplus) */
#endif /* __WINE_DDRAW_H */ #endif /* __DDRAW_INCLUDED__ */
include/ddrawi.h
View file @ 6ef4e780
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef __WINE_DDRAWI_H #ifndef __DDRAWI_INCLUDED__
#define __WINE_DDRAWI_H #define __DDRAWI_INCLUDED__
#include <ddraw.h> #include <ddraw.h>
#include <dciddi.h> /* the DD HAL is layered onto DCI escapes */ #include <dciddi.h> /* the DD HAL is layered onto DCI escapes */
...@@ -1067,4 +1067,4 @@ typedef struct _DDRAWI_DDRAWPALETTE_LCL { ...@@ -1067,4 +1067,4 @@ typedef struct _DDRAWI_DDRAWPALETTE_LCL {
} /* extern "C" */ } /* extern "C" */
#endif #endif
#endif /* __WINE_DDRAWI_H */ #endif /* __DDRAWI_INCLUDED__ */
include/ddstream.idl
View file @ 6ef4e780
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
import "unknwn.idl"; import "unknwn.idl";
import "mmstream.idl"; import "mmstream.idl";
cpp_quote("#ifndef __WINE_DDRAW_H") cpp_quote("#ifndef __DDRAW_INCLUDED__")
typedef void * LPDDSURFACEDESC; typedef void * LPDDSURFACEDESC;
typedef struct tDDSURFACEDESC DDSURFACEDESC; typedef struct tDDSURFACEDESC DDSURFACEDESC;
interface IDirectDraw; interface IDirectDraw;
......
include/dinput.h
View file @ 6ef4e780
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef __WINE_DINPUT_H #ifndef __DINPUT_INCLUDED__
#define __WINE_DINPUT_H #define __DINPUT_INCLUDED__
#define COM_NO_WINDOWS_H #define COM_NO_WINDOWS_H
#include <objbase.h> #include <objbase.h>
...@@ -2298,4 +2298,4 @@ HRESULT WINAPI DirectInputCreateEx(HINSTANCE,DWORD,REFIID,LPVOID *,LPUNKNOWN); ...@@ -2298,4 +2298,4 @@ HRESULT WINAPI DirectInputCreateEx(HINSTANCE,DWORD,REFIID,LPVOID *,LPUNKNOWN);
}; };
#endif #endif
#endif /* __WINE_DINPUT_H */ #endif /* __DINPUT_INCLUDED__ */
include/dsound.h
View file @ 6ef4e780
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef __WINE_DSOUND_H #ifndef __DSOUND_INCLUDED__
#define __WINE_DSOUND_H #define __DSOUND_INCLUDED__
#ifndef DIRECTSOUND_VERSION #ifndef DIRECTSOUND_VERSION
#define DIRECTSOUND_VERSION 0x0900 #define DIRECTSOUND_VERSION 0x0900
...@@ -1194,4 +1194,4 @@ DECLARE_INTERFACE_(IDirectSoundFullDuplex,IUnknown) ...@@ -1194,4 +1194,4 @@ DECLARE_INTERFACE_(IDirectSoundFullDuplex,IUnknown)
} /* extern "C" */ } /* extern "C" */
#endif /* defined(__cplusplus) */ #endif /* defined(__cplusplus) */
#endif /* __WINE_DSOUND_H */ #endif /* __DSOUND_INCLUDED__ */
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