Module: wine Branch: master Commit: 2349a5eb4fbb1b8b1abedcad226d3d98eae1f261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2349a5eb4fbb1b8b1abedcad22...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Sep 7 11:36:46 2010 +0200
include: Move some included files outside of extern "C".
---
include/ddrawi.h | 6 +++--- include/mapival.h | 8 ++++---- include/msi.h | 8 ++++---- include/rpcndr.h | 4 ++-- include/shlobj.h | 5 ++--- 5 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/include/ddrawi.h b/include/ddrawi.h index 8b3b632..4e3c9e3 100644 --- a/include/ddrawi.h +++ b/include/ddrawi.h @@ -22,13 +22,13 @@ #ifndef __WINE_DDRAWI_H #define __WINE_DDRAWI_H
+#include <ddraw.h> +#include <dciddi.h> /* the DD HAL is layered onto DCI escapes */ + #ifdef __cplusplus extern "C" { #endif
-#include <ddraw.h> -#include <dciddi.h> /* the DD HAL is layered onto DCI escapes */ - typedef struct _DDVIDEOPORTCAPS *LPDDVIDEOPORTCAPS; /* should be in dvp.h */ typedef struct _DDKERNELCAPS *LPDDKERNELCAPS; /* should be in ddkernel.h */ typedef struct _VMEMHEAP *LPVMEMHEAP; /* should be in dmemmgr.h */ diff --git a/include/mapival.h b/include/mapival.h index 82cd020..e44c21e 100644 --- a/include/mapival.h +++ b/include/mapival.h @@ -19,14 +19,14 @@ #ifndef MAPIVAL_H #define MAPIVAL_H
-#ifdef __cplusplus -extern "C" { -#endif - #include <mapiutil.h> #include <stddef.h> #include <stdarg.h>
+#ifdef __cplusplus +extern "C" { +#endif + BOOL WINAPI FBadRglpszW(LPWSTR*,ULONG); BOOL WINAPI FBadRowSet(LPSRowSet); BOOL WINAPI FBadRglpNameID(LPMAPINAMEID*,ULONG); diff --git a/include/msi.h b/include/msi.h index 164cd26..550ce95 100644 --- a/include/msi.h +++ b/include/msi.h @@ -19,14 +19,14 @@ #ifndef __WINE_MSI_H #define __WINE_MSI_H
-#ifdef __cplusplus -extern "C" { -#endif - #ifndef _MSI_NO_CRYPTO #include <wincrypt.h> #endif
+#ifdef __cplusplus +extern "C" { +#endif + typedef ULONG MSIHANDLE;
typedef enum tagINSTALLSTATE diff --git a/include/rpcndr.h b/include/rpcndr.h index 5ab0685..8c1b4df 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -24,12 +24,12 @@ #ifndef __WINE_RPCNDR_H #define __WINE_RPCNDR_H
+#include <basetsd.h> + #ifdef __cplusplus extern "C" { #endif
-#include <basetsd.h> - #undef CONST_VTBL #ifdef CONST_VTABLE # define CONST_VTBL const diff --git a/include/shlobj.h b/include/shlobj.h index cda1306..e0170ea 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -23,6 +23,8 @@ #include <commctrl.h> #include <prsht.h> #include <shlguid.h> +#include <shtypes.h> +#include <shobjidl.h>
#ifdef WINE_NO_UNICODE_MACROS #undef GetObject @@ -35,9 +37,6 @@ extern "C" { /* Except for specific structs, this header is byte packed */ #include <pshpack1.h>
-#include <shtypes.h> -#include <shobjidl.h> - #ifndef HPSXA_DEFINED #define HPSXA_DEFINED DECLARE_HANDLE(HPSXA);