[CPLS]

* Add header guards to the main headers.
CORE-7716

svn path=/trunk/; revision=61993

diff --git a/reactos/dll/cpl/access/access.h b/reactos/dll/cpl/access/access.h
index 2309d68..0567616 100644 (file)
--- a/reactos/dll/cpl/access/access.h
+++ b/reactos/dll/cpl/access/access.h
@@ -1,3 +1,6 @@
+#ifndef _ACCESS_H
+#define _ACCESS_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -68,4 +71,4 @@ INT_PTR CALLBACK KeyboardPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 INT_PTR CALLBACK MousePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK SoundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
-/* EOF */
+#endif /* _ACCESS_H */

diff --git a/reactos/dll/cpl/appwiz/appwiz.h b/reactos/dll/cpl/appwiz/appwiz.h
index 73d7e9a..d27224f 100644 (file)
--- a/reactos/dll/cpl/appwiz/appwiz.h
+++ b/reactos/dll/cpl/appwiz/appwiz.h
@@ -1,3 +1,6 @@
+#ifndef _APPWIZ_H
+#define _APPWIZ_H
+
 #include <config.h>
 #include <wine/port.h>
 
@@ -82,4 +85,4 @@ static inline WCHAR *heap_strdupAtoW(const char *str)
     return ret;
 }
 
-/* EOF */
+#endif /* _APPWIZ_H */

diff --git a/reactos/dll/cpl/console/console.h b/reactos/dll/cpl/console/console.h
index 3d96a43..adce5f9 100644 (file)
--- a/reactos/dll/cpl/console/console.h
+++ b/reactos/dll/cpl/console/console.h
@@ -1,10 +1,11 @@
 #ifndef CONSOLE_H__
 #define CONSOLE_H__
 
-#define WIN32_NO_STATUS
 #include <limits.h> // just for UINT_MAX in layout.c
 #include <tchar.h>
 
+#define WIN32_NO_STATUS
+
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>

diff --git a/reactos/dll/cpl/desk/desk.h b/reactos/dll/cpl/desk/desk.h
index 57f3aa9..237531b 100644 (file)
--- a/reactos/dll/cpl/desk/desk.h
+++ b/reactos/dll/cpl/desk/desk.h
@@ -1,3 +1,6 @@
+#ifndef _DESK_H
+#define _DESK_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -126,3 +129,4 @@ RegLoadMUIStringW(IN HKEY hKey,
                   IN DWORD Flags,
                   IN LPCWSTR pszDirectory  OPTIONAL);
 
+#endif /* _DESK_H */

diff --git a/reactos/dll/cpl/input/input.h b/reactos/dll/cpl/input/input.h
index ec4eb7c..374ed7e 100644 (file)
--- a/reactos/dll/cpl/input/input.h
+++ b/reactos/dll/cpl/input/input.h
@@ -1,3 +1,6 @@
+#ifndef _INPUT_H
+#define _INPUT_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -70,4 +73,4 @@ GetHotkeys(LPTSTR szHotkey, LPTSTR szLangHotkey, LPTSTR szLayoutHotkey);
 
 void ShowLastWin32Error(HWND hWndOwner);
 
-/* EOF */
+#endif /* _INPUT_H */

diff --git a/reactos/dll/cpl/intl/intl.h b/reactos/dll/cpl/intl/intl.h
index c4a1076..01e494f 100644 (file)
--- a/reactos/dll/cpl/intl/intl.h
+++ b/reactos/dll/cpl/intl/intl.h
@@ -1,3 +1,6 @@
+#ifndef _INTL_H
+#define _INTL_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -114,4 +117,4 @@ SetupApplet(HWND hwndDlg, LCID lcid);
 /* kblayouts.c */
 VOID AddNewKbLayoutsByLcid(LCID Lcid);
 
-/* EOF */
+#endif /* _INTL_H */

diff --git a/reactos/dll/cpl/main/main.h b/reactos/dll/cpl/main/main.h
index 7876ca5..6cff5cd 100644 (file)
--- a/reactos/dll/cpl/main/main.h
+++ b/reactos/dll/cpl/main/main.h
@@ -1,3 +1,6 @@
+#ifndef _MAIN_H
+#define _MAIN_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -61,4 +64,4 @@ PropSheetAddPage(HPROPSHEETPAGE hpage, LPARAM lParam);
 LONG APIENTRY
 MouseApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
 
-/* EOF */
+#endif /* _MAIN_H */

diff --git a/reactos/dll/cpl/mmsys/mmsys.h b/reactos/dll/cpl/mmsys/mmsys.h
index 0b903a4..004425b 100644 (file)
--- a/reactos/dll/cpl/mmsys/mmsys.h
+++ b/reactos/dll/cpl/mmsys/mmsys.h
@@ -1,3 +1,6 @@
+#ifndef _MMSYS_H
+#define _MMSYS_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -79,4 +82,4 @@ AudioDlgProc(HWND hwndDlg,
              WPARAM wParam,
              LPARAM lParam);
 
-/* EOF */
+#endif /* _MMSYS_H */

diff --git a/reactos/dll/cpl/powercfg/powercfg.h b/reactos/dll/cpl/powercfg/powercfg.h
index bec12e9..f084963 100644 (file)
--- a/reactos/dll/cpl/powercfg/powercfg.h
+++ b/reactos/dll/cpl/powercfg/powercfg.h
@@ -1,3 +1,6 @@
+#ifndef _POWERCFG_H
+#define _POWERCFG_H
+
 #include <stdarg.h>
 
 #define _INC_WINDOWS
@@ -34,4 +37,4 @@ INT_PTR CALLBACK AlarmsDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lP
 INT_PTR CALLBACK AdvancedDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK HibernateDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
-/* EOF */
+#endif /* _POWERCFG_H */

diff --git a/reactos/dll/cpl/timedate/timedate.h b/reactos/dll/cpl/timedate/timedate.h
index ecdb2a5..cf9eac1 100644 (file)
--- a/reactos/dll/cpl/timedate/timedate.h
+++ b/reactos/dll/cpl/timedate/timedate.h
@@ -1,3 +1,6 @@
+#ifndef _TIMEDATE_H
+#define _TIMEDATE_H
+
 #include <stdarg.h>
 
 #define _INC_WINDOWS
@@ -118,4 +121,4 @@ typedef struct _NMMCCAUTOUPDATE
 BOOL RegisterMonthCalControl(IN HINSTANCE hInstance);
 VOID UnregisterMonthCalControl(IN HINSTANCE hInstance);
 
-/* EOF */
+#endif /* _TIMEDATE_H */

diff --git a/reactos/dll/cpl/usrmgr/misc.c b/reactos/dll/cpl/usrmgr/misc.c
index 50f6457..2aed5d5 100644 (file)
--- a/reactos/dll/cpl/usrmgr/misc.c
+++ b/reactos/dll/cpl/usrmgr/misc.c
@@ -9,7 +9,6 @@
 
 #include "usrmgr.h"
 
-
 VOID
 DebugPrintf(LPTSTR szFormat, ...)
 {

diff --git a/reactos/dll/cpl/usrmgr/users.c b/reactos/dll/cpl/usrmgr/users.c
index 8ade77f..ca0b518 100644 (file)
--- a/reactos/dll/cpl/usrmgr/users.c
+++ b/reactos/dll/cpl/usrmgr/users.c
@@ -16,7 +16,6 @@
 
 #include "usrmgr.h"
 
-
 typedef struct _USER_DATA
 {
     HMENU hPopupMenu;

diff --git a/reactos/dll/cpl/usrmgr/usrmgr.h b/reactos/dll/cpl/usrmgr/usrmgr.h
index e14f7ce..f212eac 100644 (file)
--- a/reactos/dll/cpl/usrmgr/usrmgr.h
+++ b/reactos/dll/cpl/usrmgr/usrmgr.h
@@ -1,5 +1,9 @@
-#define WIN32_NO_STATUS
+#ifndef _USRMGR_H
+#define _USRMGR_H
+
 #include <stdarg.h>
+
+#define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
 #include <winuser.h>
@@ -43,3 +47,5 @@ CheckAccountName(HWND hwndDlg,
 /* userprops.c */
 BOOL
 UserProperties(HWND hwndDlg);
+
+#endif /* _USRMGR_H */

diff --git a/reactos/dll/cpl/wined3dcfg/wined3dcfg.h b/reactos/dll/cpl/wined3dcfg/wined3dcfg.h
index f1b3fc4..5293d66 100644 (file)
--- a/reactos/dll/cpl/wined3dcfg/wined3dcfg.h
+++ b/reactos/dll/cpl/wined3dcfg/wined3dcfg.h
@@ -1,3 +1,6 @@
+#ifndef _WINED3DCFG_PCH_
+#define _WINED3DCFG_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -36,3 +39,5 @@
 #define KEY_LOCKING               L"RenderTargetLockMode"
 
 INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+#endif /* _WINED3DCFG_PCH_ */