Guard IN, OUT, and OPTIONAL by guards to prevent double definition warning.

svn path=/branches/header-work/; revision=45708

diff --git a/include/ddk/winddk.h b/include/ddk/winddk.h
index e89a37a..31d3db4 100644 (file)
--- a/include/ddk/winddk.h
+++ b/include/ddk/winddk.h
@@ -49,10 +49,18 @@ extern "C" {
 #endif
 
 /* Pseudo modifiers for parameters */
+#ifndef IN
 #define IN
+#endif
+#ifndef OUT
 #define OUT
+#endif
+#ifndef OPTIONAL
 #define OPTIONAL
+#endif
+#ifndef UNALLIGNED
 #define UNALLIGNED
+#endif
 
 #define CONST const
 

diff --git a/include/psdk/windef.h b/include/psdk/windef.h
index a985b5a..97ccf73 100644 (file)
--- a/include/psdk/windef.h
+++ b/include/psdk/windef.h
@@ -64,8 +64,13 @@ extern "C" {
 #ifndef TRUE
 #define TRUE 1
 #endif
+
+#ifndef IN
 #define IN
+#endif
+#ifndef OUT
 #define OUT
+#endif
 #ifndef OPTIONAL
 #define OPTIONAL
 #endif