Francois Gouget : include: Add the missing guiddef.h include directives.
Alexandre Julliard
julliard at winehq.org
Tue Dec 20 13:43:25 CST 2011
Module: wine
Branch: master
Commit: 785d7a8841ec1ebe1da080d718621198b7be3ae5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=785d7a8841ec1ebe1da080d718621198b7be3ae5
Author: Francois Gouget <fgouget at free.fr>
Date: Tue Dec 20 09:18:07 2011 +0100
include: Add the missing guiddef.h include directives.
---
include/cfgmgr32.h | 4 ++++
include/dbt.h | 4 ++++
include/ntddndis.h | 12 ++++++++----
include/ntsecapi.h | 4 ++++
4 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h
index cd26df8..64f0881 100644
--- a/include/cfgmgr32.h
+++ b/include/cfgmgr32.h
@@ -21,6 +21,10 @@
/* FIXME: #include <cfg.h> */
+#ifndef GUID_DEFINED
+# include <guiddef.h>
+#endif
+
/* cfgmgr32 doesn't use the normal convention, it adds an underscore before A/W */
#ifdef WINE_NO_UNICODE_MACROS
# define DECL_WINELIB_CFGMGR32_TYPE_AW(type) /* nothing */
diff --git a/include/dbt.h b/include/dbt.h
index 88a1df4..b326dc2 100644
--- a/include/dbt.h
+++ b/include/dbt.h
@@ -19,6 +19,10 @@
#ifndef __WINE_DBT_H
#define __WINE_DBT_H
+#ifndef GUID_DEFINED
+# include <guiddef.h>
+#endif
+
/* dbt.h doesn't use the normal convention, it adds an underscore before A/W */
#ifdef WINE_NO_UNICODE_MACROS
# define DECL_WINELIB_DBT_TYPE_AW(type) /* nothing */
diff --git a/include/ntddndis.h b/include/ntddndis.h
index 5085f25..1715628 100644
--- a/include/ntddndis.h
+++ b/include/ntddndis.h
@@ -19,14 +19,18 @@
#ifndef _NTDDNDIS_
#define _NTDDNDIS_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#include <ifdef.h>
#include <devpkey.h>
/* #include <pciprop.h> */
+#ifndef GUID_DEFINED
+# include <guiddef.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define _NDIS_CONTROL_CODE(request, method) \
CTL_CODE(FILE_DEVICE_PHYSICAL_NETCARD, request, method, FILE_ANY_ACCESS)
diff --git a/include/ntsecapi.h b/include/ntsecapi.h
index adfd930..2bb3d31 100644
--- a/include/ntsecapi.h
+++ b/include/ntsecapi.h
@@ -19,6 +19,10 @@
#ifndef __WINE_NTSECAPI_H
#define __WINE_NTSECAPI_H
+#ifndef GUID_DEFINED
+# include <guiddef.h>
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
More information about the wine-cvs
mailing list