include: Add more header guards

André Hentschel nerv at dawncrow.de
Thu Mar 19 15:35:56 CDT 2015


---
 include/aviriff.h      | 5 +++++
 include/cvconst.h      | 5 +++++
 include/devguid.h      | 5 +++++
 include/devpkey.h      | 5 +++++
 include/knownfolders.h | 5 +++++
 include/mciavi.h       | 5 +++++
 include/rasdlg.h       | 5 +++++
 7 files changed, 35 insertions(+)

diff --git a/include/aviriff.h b/include/aviriff.h
index d2cfa41..281dc6c 100644
--- a/include/aviriff.h
+++ b/include/aviriff.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef __WINE_AVIRIFF_H
+#define __WINE_AVIRIFF_H
+
 /* All definitions here are packed structures of on-disk formats */
 #include <pshpack2.h>
 
@@ -322,3 +325,5 @@ typedef struct _avifieldindex_chunk {
 } AVIFIELDINDEX, * PAVIFIELDINDEX;
 
 #include <poppack.h>
+
+#endif  /* __WINE_AVIRIFF_H */
diff --git a/include/cvconst.h b/include/cvconst.h
index 9ad6324..bd094ee 100644
--- a/include/cvconst.h
+++ b/include/cvconst.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef __WINE_CVCONST_H
+#define __WINE_CVCONST_H
+
 /* information in this file is highly derived from MSDN DIA information pages */
 
 /* symbols & types enumeration */
@@ -708,3 +711,5 @@ typedef enum CV_call_e
     CV_CALL_M32RCALL,
     CV_CALL_RESERVED,
 } CV_call_e;
+
+#endif  /* __WINE_CVCONST_H */
diff --git a/include/devguid.h b/include/devguid.h
index d7b2a87..9066e18 100644
--- a/include/devguid.h
+++ b/include/devguid.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef __WINE_DEVGUID_H
+#define __WINE_DEVGUID_H
+
 DEFINE_GUID( GUID_DEVCLASS_1394,
   0x6BDD1FC1, 0x810F, 0x11D0, 0xBE, 0xC7, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F );
 DEFINE_GUID( GUID_DEVCLASS_ADAPTER,
@@ -104,3 +107,5 @@ DEFINE_GUID( GUID_DEVCLASS_USB,
   0x36FC9E60, 0xC465, 0x11CF, 0x80, 0x56, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00 );
 DEFINE_GUID( GUID_DEVCLASS_VOLUME,
   0x71A27CDD, 0x812A, 0x11D0, 0xBE, 0xC7, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F );
+
+#endif  /* __WINE_DEVGUID_H */
diff --git a/include/devpkey.h b/include/devpkey.h
index ebaabc1..77a4adf 100644
--- a/include/devpkey.h
+++ b/include/devpkey.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef __WINE_DEVPKEY_H
+#define __WINE_DEVPKEY_H
+
 #include <devpropdef.h>
 
 /* TODO: Not all DEVPROPKEYS have been defined here */
@@ -60,3 +63,5 @@ DEFINE_DEVPROPKEY(DEVPKEY_Device_BaseContainerId, 0xa45c254e,0xdf1c,0x4efd,0x80,
 DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_FriendlyName, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 2);
 DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_Enabled, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 3);
 DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_ClassGuid, 0x026e516e,0x8b14,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 4);
+
+#endif  /* __WINE_DEVPKEY_H */
diff --git a/include/knownfolders.h b/include/knownfolders.h
index 2fa5664..28e867c 100644
--- a/include/knownfolders.h
+++ b/include/knownfolders.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef __WINE_KNOWNFOLDERS_H
+#define __WINE_KNOWNFOLDERS_H
+
 #ifdef DEFINE_KNOWN_FOLDER
 #undef DEFINE_KNOWN_FOLDER
 #endif
@@ -140,3 +143,5 @@ DEFINE_KNOWN_FOLDER(FOLDERID_UsersLibraries,        0xa302545d, 0xdeff, 0x464b,
 DEFINE_KNOWN_FOLDER(FOLDERID_Videos,                0x18989b1d, 0x99b5, 0x455b, 0x84, 0x1c, 0xab, 0x7c, 0x74, 0xe4, 0xdd, 0xfc);
 DEFINE_KNOWN_FOLDER(FOLDERID_VideosLibrary,         0x491e922f, 0x5643, 0x4af4, 0xa7, 0xeb, 0x4e, 0x7a, 0x13, 0x8d, 0x81, 0x74);
 DEFINE_KNOWN_FOLDER(FOLDERID_Windows,               0xf38bf404, 0x1d43, 0x42f2, 0x93, 0x05, 0x67, 0xde, 0x0b, 0x28, 0xfc, 0x23);
+
+#endif  /* __WINE_KNOWNFOLDERS_H */
diff --git a/include/mciavi.h b/include/mciavi.h
index 7a546e2..3cffe2c 100644
--- a/include/mciavi.h
+++ b/include/mciavi.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef __WINE_MCIAVI_H
+#define __WINE_MCIAVI_H
+
 #define MCI_MCIAVI_PLAY_WINDOW          __MSABI_LONG(0x01000000)
 #define MCI_MCIAVI_PLAY_FULLSCREEN      __MSABI_LONG(0x02000000)
 #define MCI_MCIAVI_PLAY_FULLBY2         __MSABI_LONG(0x04000000)
@@ -41,3 +44,5 @@
 #define MCIERR_AVI_DISPLAYERROR         (MCIERR_CUSTOM_DRIVER_BASE + 106)
 #define MCIERR_AVI_AUDIOERROR		(MCIERR_CUSTOM_DRIVER_BASE + 107)
 #define MCIERR_AVI_BADPALETTE		(MCIERR_CUSTOM_DRIVER_BASE + 108)
+
+#endif  /* __WINE_MCIAVI_H */
diff --git a/include/rasdlg.h b/include/rasdlg.h
index 7f2a6d8..2967e6e 100644
--- a/include/rasdlg.h
+++ b/include/rasdlg.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef __WINE_RASDLG_H
+#define __WINE_RASDLG_H
+
 #include <ras.h>
 
 typedef struct tagRASENTRYDLGW
@@ -30,3 +33,5 @@ typedef struct tagRASENTRYDLGW
     ULONG_PTR reserved;
     ULONG_PTR reserved2;
 } RASENTRYDLGW;
+
+#endif  /* __WINE_RASDLG_H */
-- 
1.9.1





More information about the wine-patches mailing list