include: Add more header guards (try 2)

André Hentschel nerv at dawncrow.de
Mon Mar 23 15:33:35 CDT 2015


Note: Using __WINE_KNOWNFOLDERS_H instead of #pragma once

---
 include/aviriff.h      | 5 +++++
 include/knownfolders.h | 5 +++++
 include/rasdlg.h       | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/include/aviriff.h b/include/aviriff.h
index d2cfa41..9fea63a 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 AVIRIFF_H
+#define 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  /* AVIRIFF_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/rasdlg.h b/include/rasdlg.h
index 7f2a6d8..6d2aa85 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 _RASDLG_H_
+#define _RASDLG_H_
+
 #include <ras.h>
 
 typedef struct tagRASENTRYDLGW
@@ -30,3 +33,5 @@ typedef struct tagRASENTRYDLGW
     ULONG_PTR reserved;
     ULONG_PTR reserved2;
 } RASENTRYDLGW;
+
+#endif  /* _RASDLG_H_ */
-- 
1.9.1




More information about the wine-patches mailing list