diff --git a/reactos/base/applications/cacls/resource.h b/reactos/base/applications/cacls/resource.h index 71778353f10..1f195b9de2c 100644 --- a/reactos/base/applications/cacls/resource.h +++ b/reactos/base/applications/cacls/resource.h @@ -1,5 +1,4 @@ -#ifndef _CACLS_RESOURCE_H -#define _CACLS_RESOURCE_H +#pragma once #define IDS_HELP 101 #define IDS_ABBR_CI 102 @@ -40,5 +39,3 @@ #define IDS_READ_CONTROL 137 #define IDS_DELETE 138 #define IDS_STANDARD_RIGHTS_ALL 139 - -#endif /* _CACLS_RESOURCE_H */ diff --git a/reactos/base/applications/calc/calc.h b/reactos/base/applications/calc/calc.h index 72c8edf796a..1e645e75e84 100644 --- a/reactos/base/applications/calc/calc.h +++ b/reactos/base/applications/calc/calc.h @@ -1,5 +1,4 @@ -#ifndef __CALC_H__ -#define __CALC_H__ +#pragma once #include #include @@ -236,5 +235,3 @@ INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp); void ConvExecute(HWND hWnd); void ConvAdjust(HWND hWnd, int n_cat); void ConvInit(HWND hWnd); - -#endif diff --git a/reactos/base/applications/charmap/precomp.h b/reactos/base/applications/charmap/precomp.h index 4e0324c3de5..a87f118d866 100644 --- a/reactos/base/applications/charmap/precomp.h +++ b/reactos/base/applications/charmap/precomp.h @@ -1,5 +1,4 @@ -#ifndef __CHARMAP_PRECOMP_H -#define __CHARMAP_PRECOMP_H +#pragma once #include #include @@ -53,5 +52,3 @@ VOID ShowAboutDlg(HWND hWndParent); BOOL RegisterMapClasses(HINSTANCE hInstance); VOID UnregisterMapClasses(HINSTANCE hInstance); - -#endif /* __CHARMAP_PRECOMP_H */ diff --git a/reactos/base/applications/cmdutils/more/resource.h b/reactos/base/applications/cmdutils/more/resource.h index eb430d80b81..08fc79b333b 100644 --- a/reactos/base/applications/cmdutils/more/resource.h +++ b/reactos/base/applications/cmdutils/more/resource.h @@ -1,20 +1,5 @@ -#ifndef RESOURCE_H__ /* resource.h */ -#define RESOURCE_H__ +#pragma once #define IDS_USAGE 100 #define IDS_CONTINUE 101 #define IDS_FILE_ACCESS 102 - - - - - - - - - - - - - -#endif /* EOF of resource.h */ diff --git a/reactos/base/applications/dxdiag/resource.h b/reactos/base/applications/dxdiag/resource.h index 03917dbc5e5..e9118d13570 100644 --- a/reactos/base/applications/dxdiag/resource.h +++ b/reactos/base/applications/dxdiag/resource.h @@ -1,5 +1,4 @@ -#ifndef RESOURCE_H__ -#define RESOURCE_H__ +#pragma once /* dialog constants */ #define IDD_MAIN_DIALOG 100 @@ -142,6 +141,3 @@ /* icon resource constants */ #define IDI_APPICON 20000 - - -#endif diff --git a/reactos/base/applications/fontview/display.h b/reactos/base/applications/fontview/display.h index aafdea8e68c..9d36e6caddf 100644 --- a/reactos/base/applications/fontview/display.h +++ b/reactos/base/applications/fontview/display.h @@ -1,5 +1,4 @@ -#ifndef _DISPLAY_H -#define _DISPLAY_H +#pragma once /* Messages for the display class */ #define FVM_SETTYPEFACE WM_USER @@ -14,5 +13,3 @@ extern const WCHAR g_szFontDisplayClassName[]; /* Public function */ BOOL Display_InitClass(HINSTANCE hInstance); - -#endif // _DISPLAY_H diff --git a/reactos/base/applications/games/solitaire/solitaire.h b/reactos/base/applications/games/solitaire/solitaire.h index 14eaebce099..3b1e1bbe1e8 100644 --- a/reactos/base/applications/games/solitaire/solitaire.h +++ b/reactos/base/applications/games/solitaire/solitaire.h @@ -1,5 +1,4 @@ -#ifndef SOLITAIRE_INCLUDED -#define SOLITAIRE_INCLUDED +#pragma once extern CardWindow SolWnd; extern TCHAR szAppName[]; @@ -54,5 +53,3 @@ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked); void CARDLIBPROC PileDblClickProc(CardRegion &stackobj, int iNumClicked); void CARDLIBPROC PileRemoveProc(CardRegion &stackobj, int iRemoved); - -#endif diff --git a/reactos/base/applications/games/spider/spider.h b/reactos/base/applications/games/spider/spider.h index 89b64ae98c2..caff04abead 100644 --- a/reactos/base/applications/games/spider/spider.h +++ b/reactos/base/applications/games/spider/spider.h @@ -1,5 +1,4 @@ -#ifndef SOLITAIRE_INCLUDED -#define SOLITAIRE_INCLUDED +#pragma once #define DIFFICULTY_ONE_COLOR 1 #define DIFFICULTY_TWO_COLORS 2 @@ -38,5 +37,3 @@ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked); void CARDLIBPROC PileDblClickProc(CardRegion &stackobj, int iNumClicked); void CARDLIBPROC PileRemoveProc(CardRegion &stackobj, int iRemoved); - -#endif diff --git a/reactos/base/applications/mmc/precomp.h b/reactos/base/applications/mmc/precomp.h index 460b8aef130..ad39a6ff1c9 100644 --- a/reactos/base/applications/mmc/precomp.h +++ b/reactos/base/applications/mmc/precomp.h @@ -1,5 +1,4 @@ -#ifndef __PRECOMP_H -#define __PRECOMP_H +#pragma once #include #include @@ -34,5 +33,3 @@ LoadAndFormatString(IN HINSTANCE hInstance, extern HINSTANCE hAppInstance; extern HANDLE hAppHeap; - -#endif /* __PRECOMP_H */ diff --git a/reactos/base/applications/mmc/resource.h b/reactos/base/applications/mmc/resource.h index 37f42f5af71..65fbe6eac65 100644 --- a/reactos/base/applications/mmc/resource.h +++ b/reactos/base/applications/mmc/resource.h @@ -1,5 +1,4 @@ -#ifndef __RESOURCE_H -#define __RESOURCE_H +#pragma once #define IDS_APPTITLE 101 #define IDS_CONSOLETITLE 102 @@ -10,5 +9,3 @@ #define ID_FILE_EXIT 1001 #define ID_HELP_ABOUT 9001 - -#endif /* __RESOURCE_H */ diff --git a/reactos/base/applications/mplay32/resource.h b/reactos/base/applications/mplay32/resource.h index f4dfddf95e4..77100332800 100644 --- a/reactos/base/applications/mplay32/resource.h +++ b/reactos/base/applications/mplay32/resource.h @@ -1,5 +1,4 @@ -#ifndef __RESOURCE_H_ -#define __RESOURCE_H_ +#pragma once /* Icons */ #define IDI_MAIN 10 @@ -51,5 +50,3 @@ #define IDC_SEEKBACK 1504 #define IDC_SEEKFORW 1505 #define IDC_FORWARD 1506 - -#endif /* __RESOURCE_H_ */ diff --git a/reactos/base/applications/mscutils/devmgmt/precomp.h b/reactos/base/applications/mscutils/devmgmt/precomp.h index d9bdd425f85..8723d8d1d55 100644 --- a/reactos/base/applications/mscutils/devmgmt/precomp.h +++ b/reactos/base/applications/mscutils/devmgmt/precomp.h @@ -1,5 +1,4 @@ -#ifndef __DEVMGMT_PRECOMP_H -#define __DEVMGMT_PRECOMP_H +#pragma once #define WIN32_LEAN_AND_MEAN #include @@ -93,5 +92,3 @@ HIMAGELIST InitImageList(UINT NumButtons, VOID GetError(VOID); VOID DisplayString(LPTSTR); - -#endif /* __DEVMGMT_PRECOMP_H */ diff --git a/reactos/base/applications/mscutils/servman/precomp.h b/reactos/base/applications/mscutils/servman/precomp.h index 9b829ad78df..a81b984c7d3 100644 --- a/reactos/base/applications/mscutils/servman/precomp.h +++ b/reactos/base/applications/mscutils/servman/precomp.h @@ -1,5 +1,4 @@ -#ifndef __SERVMAN_PRECOMP_H -#define __SERVMAN_PRECOMP_H +#pragma once //#define WIN32_LEAN_AND_MEAN #include @@ -185,5 +184,3 @@ HIMAGELIST InitImageList(UINT StartResource, UINT Width, UINT Height, ULONG type); - -#endif /* __SERVMAN_PRECOMP_H */ diff --git a/reactos/base/applications/mstsc/bsops.h b/reactos/base/applications/mstsc/bsops.h index 6785c46d1e9..6b596f6cd01 100644 --- a/reactos/base/applications/mstsc/bsops.h +++ b/reactos/base/applications/mstsc/bsops.h @@ -18,8 +18,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __BSOPS_MSTSC_H -#define __BSOPS_MSTSC_H +#pragma once int bs_get_pixel(int x, int y); void bs_set_pixel(int x, int y, int pixel, int rop, int use_clip); @@ -50,5 +49,3 @@ void bs_patblt(int opcode, int x, int y, int cx, int cy, int brush_style, char * brush_pattern, int brush_x_org, int brush_y_org, int bgcolour, int fgcolour); - -#endif /* __BSOPS_MSTSC_H */ diff --git a/reactos/base/applications/mstsc/orders.h b/reactos/base/applications/mstsc/orders.h index 70a387168e1..2c8f919cfd8 100644 --- a/reactos/base/applications/mstsc/orders.h +++ b/reactos/base/applications/mstsc/orders.h @@ -18,8 +18,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __ORDERS_MSTSC_H -#define __ORDERS_MSTSC_H +#pragma once #define RDP_ORDER_STANDARD 0x01 #define RDP_ORDER_SECONDARY 0x02 @@ -369,5 +368,3 @@ typedef struct _RDP_COLCACHE_ORDER } RDP_COLCACHE_ORDER; - -#endif /* __ORDERS_MSTSC_H */ diff --git a/reactos/base/applications/mstsc/proto.h b/reactos/base/applications/mstsc/proto.h index e75e588af71..57f6a9ef4d4 100644 --- a/reactos/base/applications/mstsc/proto.h +++ b/reactos/base/applications/mstsc/proto.h @@ -17,8 +17,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef RDESKTOP_PROTO_H -#define RDESKTOP_PROTO_H +#pragma once /* *INDENT-OFF* */ #ifdef __cplusplus @@ -306,5 +305,3 @@ unsigned int seamless_send_focus(unsigned long id, unsigned long flags); } #endif /* *INDENT-ON* */ - -#endif diff --git a/reactos/base/applications/mstsc/rdesktop.h b/reactos/base/applications/mstsc/rdesktop.h index c9f97b3d4b9..f61a94b14df 100644 --- a/reactos/base/applications/mstsc/rdesktop.h +++ b/reactos/base/applications/mstsc/rdesktop.h @@ -18,8 +18,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __RDESKTOP_MSTSC_H -#define __RDESKTOP_MSTSC_H +#pragma once #include #include @@ -127,5 +126,3 @@ #ifndef MAKE_PROTO #include "proto.h" #endif - -#endif /* __RDESKTOP_MSTSC_H */ diff --git a/reactos/base/applications/mstsc/uimain.h b/reactos/base/applications/mstsc/uimain.h index c03a0796fce..b9972ef3bbf 100644 --- a/reactos/base/applications/mstsc/uimain.h +++ b/reactos/base/applications/mstsc/uimain.h @@ -18,8 +18,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __UIMAIN_MSTSC_H -#define __UIMAIN_MSTSC_H +#pragma once /* in uimain.c */ int @@ -77,5 +76,3 @@ ui_set_modifier_state(int code); #define UI_MAX(a, b) (((a) > (b)) ? (a) : (b)) #undef UI_MIN #define UI_MIN(a, b) (((a) < (b)) ? (a) : (b)) - -#endif /* __UIMAIN_MSTSC_H */ diff --git a/reactos/base/applications/network/finger/err.h b/reactos/base/applications/network/finger/err.h index bbc7397f852..bab0285d7e3 100644 --- a/reactos/base/applications/network/finger/err.h +++ b/reactos/base/applications/network/finger/err.h @@ -33,8 +33,7 @@ * @(#)err.h 8.1 (Berkeley) 6/2/93 */ -#ifndef _ERR_H_ -#define _ERR_H_ +#pragma once /* * Don't use va_list in the err/warn prototypes. Va_list is typedef'd in two @@ -56,5 +55,3 @@ void warn __P((const char *, ...)); void vwarn __P((const char *, va_list)); void warnx __P((const char *, ...)); void vwarnx __P((const char *, va_list)); - -#endif /* !_ERR_H_ */ diff --git a/reactos/base/applications/network/finger/various.h b/reactos/base/applications/network/finger/various.h index cb7572ee5b3..03c277b8b44 100644 --- a/reactos/base/applications/network/finger/various.h +++ b/reactos/base/applications/network/finger/various.h @@ -1,9 +1,7 @@ // Various things you need when porting BSD and GNU utilities to // Win32. -#ifndef VARIOUS_H -#define VARIOUS_H - +#pragma once typedef float f4byte_t; typedef double f8byte_t; @@ -32,5 +30,3 @@ typedef long uid_t; // SunOS 5.5 #define rindex(s, c) strrchr(s, c) void netfinger(char *); - -#endif diff --git a/reactos/base/applications/network/telnet/src/ansiprsr.h b/reactos/base/applications/network/telnet/src/ansiprsr.h index a8396d29212..bd2ccc4dd19 100644 --- a/reactos/base/applications/network/telnet/src/ansiprsr.h +++ b/reactos/base/applications/network/telnet/src/ansiprsr.h @@ -1,5 +1,4 @@ -#ifndef __ANSIPRSR_H -#define __ANSIPRSR_H +#pragma once #include #include @@ -81,5 +80,3 @@ public: char* ParseBuffer(char* pszBuffer, char* pszBufferEnd); static int StripBuffer(char* pszBuffer, char* pszBufferEnd, int width); }; - -#endif diff --git a/reactos/base/applications/network/telnet/src/keytrans.h b/reactos/base/applications/network/telnet/src/keytrans.h index 21bb85afa0a..c4a49c12033 100644 --- a/reactos/base/applications/network/telnet/src/keytrans.h +++ b/reactos/base/applications/network/telnet/src/keytrans.h @@ -18,8 +18,7 @@ // DeleteKeyDef : Deletes a key def from the list // /////////////////////////////////////////////////////////////////// -#ifndef __KEYTRANS_H -#define __KEYTRANS_H +#pragma once #include "tkeydef.h" #include "tkeymap.h" @@ -93,5 +92,3 @@ private: int currentKeyMap, mainKeyMap; // AVS }; - -#endif // __KEYTRANS_H diff --git a/reactos/base/applications/network/telnet/src/stl_bids.h b/reactos/base/applications/network/telnet/src/stl_bids.h index 5d70f7fab07..59470ed8734 100644 --- a/reactos/base/applications/network/telnet/src/stl_bids.h +++ b/reactos/base/applications/network/telnet/src/stl_bids.h @@ -1,8 +1,7 @@ // This is the STL wrapper for classlib/arrays.h from Borland's web site // It has been modified to be compatible with vc++ (Paul Branann 5/7/98) -#ifndef STL_ARRAY_AS_VECTOR -#define STL_ARRAY_AS_VECTOR +#pragma once #ifdef _MSC_VER #pragma warning(disable: 4786) @@ -156,5 +155,3 @@ public: } }; - -#endif diff --git a/reactos/base/applications/network/telnet/src/tcharmap.h b/reactos/base/applications/network/telnet/src/tcharmap.h index cbc97e3dea6..caf6dee5f2f 100644 --- a/reactos/base/applications/network/telnet/src/tcharmap.h +++ b/reactos/base/applications/network/telnet/src/tcharmap.h @@ -1,8 +1,7 @@ // This is a simple class to handle character maps // (Paul Brannan 6/25/98) -#ifndef __TCHARMAP_H -#define __TCHARMAP_H +#pragma once class TCharmap { private: @@ -37,5 +36,3 @@ public: int enabled; }; - -#endif diff --git a/reactos/base/applications/network/telnet/src/tconsole.h b/reactos/base/applications/network/telnet/src/tconsole.h index 81e59894b69..b90cb304aa8 100644 --- a/reactos/base/applications/network/telnet/src/tconsole.h +++ b/reactos/base/applications/network/telnet/src/tconsole.h @@ -1,5 +1,4 @@ -#ifndef __TNPARSER_H -#define __TNPARSER_H +#pragma once #include "tnconfig.h" @@ -168,5 +167,3 @@ void saveScreen(CHAR_INFO* chiBuffer); void restoreScreen(CHAR_INFO* chiBuffer); CHAR_INFO* newBuffer(); void deleteBuffer(CHAR_INFO* chiBuffer); - -#endif diff --git a/reactos/base/applications/network/telnet/src/telnet.h b/reactos/base/applications/network/telnet/src/telnet.h index dbb2cdedc3b..3fd11f2ebc8 100644 --- a/reactos/base/applications/network/telnet/src/telnet.h +++ b/reactos/base/applications/network/telnet/src/telnet.h @@ -1,5 +1,4 @@ -#ifndef ___TELNET_H -#define ___TELNET_H +#pragma once /* * Copyright (c) 1983 Regents of the University of California. @@ -298,8 +297,3 @@ extern char *enctype_names[]; #define ENCTYPE_NAME(x) enctype_names[x] ////////////////////////////////////////////////////// ////////////////////////////////////////////////////// - - - -#endif - diff --git a/reactos/base/applications/network/telnet/src/tkeydef.h b/reactos/base/applications/network/telnet/src/tkeydef.h index c44a5bca164..49f7648e1f6 100644 --- a/reactos/base/applications/network/telnet/src/tkeydef.h +++ b/reactos/base/applications/network/telnet/src/tkeydef.h @@ -3,8 +3,7 @@ // - keeped in an array container // ///////////////////////////////////////////////////////// -#ifndef __TKEYDEF_H -#define __TKEYDEF_H +#pragma once #include @@ -67,5 +66,3 @@ public: DWORD GetCodeKey() { return vk_code; } }; - -#endif diff --git a/reactos/base/applications/network/telnet/src/tkeymap.h b/reactos/base/applications/network/telnet/src/tkeymap.h index 0501c20fbb9..82b70c9b898 100644 --- a/reactos/base/applications/network/telnet/src/tkeymap.h +++ b/reactos/base/applications/network/telnet/src/tkeymap.h @@ -1,5 +1,4 @@ -#ifndef __TKEYMAP_H -#define __TKEYMAP_H +#pragma once #include "tkeydef.h" @@ -35,5 +34,3 @@ struct KeyMap { ~KeyMap(); }; - -#endif diff --git a/reactos/base/applications/network/telnet/src/tmapldr.h b/reactos/base/applications/network/telnet/src/tmapldr.h index 4a80966f0cd..03b650da7ec 100644 --- a/reactos/base/applications/network/telnet/src/tmapldr.h +++ b/reactos/base/applications/network/telnet/src/tmapldr.h @@ -68,8 +68,7 @@ // // /////////////////////////////////////////////////////////////////// -#ifndef __TLOADMAP_H -#define __TLOADMAP_H +#pragma once #include "keytrans.h" #include "tcharmap.h" @@ -101,5 +100,3 @@ private: int LoadCharMap(string buf); }; - -#endif diff --git a/reactos/base/applications/network/telnet/src/tmouse.h b/reactos/base/applications/network/telnet/src/tmouse.h index fde6ec71828..3bb9d1f7981 100644 --- a/reactos/base/applications/network/telnet/src/tmouse.h +++ b/reactos/base/applications/network/telnet/src/tmouse.h @@ -1,5 +1,4 @@ -#ifndef __TMOUSE_H -#define __TMOUSE_H +#pragma once #include "tnclip.h" #include @@ -25,5 +24,3 @@ public: TMouse(Tnclip &RefClipboard); ~TMouse(); }; - -#endif diff --git a/reactos/base/applications/network/telnet/src/tnclass.h b/reactos/base/applications/network/telnet/src/tnclass.h index f29dfa3e87f..da204acd19f 100644 --- a/reactos/base/applications/network/telnet/src/tnclass.h +++ b/reactos/base/applications/network/telnet/src/tnclass.h @@ -1,5 +1,4 @@ -#ifndef __TNCLASS_H_ -#define __TNCLASS_H_ +#pragma once #include #include "tnconfig.h" @@ -69,6 +68,3 @@ private: void NewProcess(); // Paul Brannan 9/13/98 void SetLocalAddress(SOCKET s); }; - -#endif - diff --git a/reactos/base/applications/network/telnet/src/tnclip.h b/reactos/base/applications/network/telnet/src/tnclip.h index cd20c30e6ec..bca147f2b59 100644 --- a/reactos/base/applications/network/telnet/src/tnclip.h +++ b/reactos/base/applications/network/telnet/src/tnclip.h @@ -1,5 +1,4 @@ -#ifndef __TNCLIP_H -#define __TNCLIP_H +#pragma once #include #include "tnetwork.h" @@ -16,5 +15,3 @@ public: void Copy(HGLOBAL clipboard_data); void Paste(); }; - -#endif diff --git a/reactos/base/applications/network/telnet/src/tncon.h b/reactos/base/applications/network/telnet/src/tncon.h index d8b94142e1d..42d75db5dbc 100644 --- a/reactos/base/applications/network/telnet/src/tncon.h +++ b/reactos/base/applications/network/telnet/src/tncon.h @@ -1,5 +1,4 @@ -#ifndef __TNCON_H -#define __TNCON_H +#pragma once #include "tparams.h" #include "tnclip.h" @@ -30,5 +29,3 @@ BOOL WINAPI ControlEventHandler(DWORD); // Bryan Montgomery 10/14/98 void setTNetwork(TNetwork); - -#endif diff --git a/reactos/base/applications/network/telnet/src/tnconfig.h b/reactos/base/applications/network/telnet/src/tnconfig.h index c0d41ee2d5e..8a55627b5c8 100644 --- a/reactos/base/applications/network/telnet/src/tnconfig.h +++ b/reactos/base/applications/network/telnet/src/tnconfig.h @@ -6,8 +6,7 @@ // It does not store any information about the current settings, only default // or recommended settings. -#ifndef __TNCONFIG_H -#define __TNCONFIG_H +#pragma once // Ioannou 2 June 98: Borland needs them - quick hack #ifdef __BORLANDC__ @@ -207,5 +206,3 @@ private: }; extern TConfig ini; - -#endif diff --git a/reactos/base/applications/network/telnet/src/tnerror.h b/reactos/base/applications/network/telnet/src/tnerror.h index a7ada284c58..1432df5db89 100644 --- a/reactos/base/applications/network/telnet/src/tnerror.h +++ b/reactos/base/applications/network/telnet/src/tnerror.h @@ -1,5 +1,4 @@ -#ifndef __TNERROR_H -#define __TNERROR_H +#pragma once #ifndef __WINDOWS_H #include @@ -12,5 +11,3 @@ extern int Telnet_Redir; int printm(LPTSTR szModule, BOOL fSystem, DWORD dwMessageId, ...); void LogErrorConsole(LPTSTR szError); int printit(const char * it); - -#endif diff --git a/reactos/base/applications/network/telnet/src/tnetwork.h b/reactos/base/applications/network/telnet/src/tnetwork.h index bcc78c7012f..317ec2d11b9 100644 --- a/reactos/base/applications/network/telnet/src/tnetwork.h +++ b/reactos/base/applications/network/telnet/src/tnetwork.h @@ -1,8 +1,7 @@ // This is a simple class to handle socket connections // (Paul Brannan 6/15/98) -#ifndef __TNETWORK_H -#define __TNETWORK_H +#pragma once #include @@ -46,5 +45,3 @@ public: void do_naws(int width, int height); }; - -#endif diff --git a/reactos/base/applications/network/telnet/src/tnmain.h b/reactos/base/applications/network/telnet/src/tnmain.h index 526742c56b6..930b9b123ad 100644 --- a/reactos/base/applications/network/telnet/src/tnmain.h +++ b/reactos/base/applications/network/telnet/src/tnmain.h @@ -1,5 +1,4 @@ -#ifndef __TNMAIN_H -#define __TNMAIN_H +#pragma once #include #include @@ -15,5 +14,3 @@ struct cmdHistory { struct cmdHistory *next; struct cmdHistory *prev; }; - -#endif diff --git a/reactos/base/applications/network/telnet/src/tnmisc.h b/reactos/base/applications/network/telnet/src/tnmisc.h index 8216a864576..22bd2cda4fa 100644 --- a/reactos/base/applications/network/telnet/src/tnmisc.h +++ b/reactos/base/applications/network/telnet/src/tnmisc.h @@ -1,5 +1,4 @@ -#ifndef __TNMISC_H -#define __TNMISC_H +#pragma once // Process-related functions BOOL CreateHiddenConsoleProcess(LPCTSTR szChildName, PROCESS_INFORMATION* ppi, @@ -14,5 +13,3 @@ HWND TelnetGetConsoleWindow(void); bool SetIcon(HWND hConsoleWindow, HANDLE hIcon, LPARAM *pOldBIcon, LPARAM *pOldSIcon, const char *icondir); void ResetIcon(HWND hConsoleWindow, LPARAM oldBIcon, LPARAM oldSIcon); - -#endif diff --git a/reactos/base/applications/network/telnet/src/tparams.h b/reactos/base/applications/network/telnet/src/tparams.h index ffd4f8cbad9..efa088599ba 100644 --- a/reactos/base/applications/network/telnet/src/tparams.h +++ b/reactos/base/applications/network/telnet/src/tparams.h @@ -1,5 +1,4 @@ -#ifndef __THREADPARAMS -#define __THREADPARAMS +#pragma once #include "ttelhndl.h" @@ -20,5 +19,3 @@ public: NetParams p; TTelnetHandler &TelHandler; }; - -#endif diff --git a/reactos/base/applications/network/telnet/src/tparser.h b/reactos/base/applications/network/telnet/src/tparser.h index 143649f5687..7356d4b198c 100644 --- a/reactos/base/applications/network/telnet/src/tparser.h +++ b/reactos/base/applications/network/telnet/src/tparser.h @@ -10,8 +10,7 @@ // - An Init() function, which will re-initialize the parser when // necessary. -#ifndef __TPARSER_H -#define __TPARSER_H +#pragma once #include "tconsole.h" #include "keytrans.h" @@ -45,5 +44,3 @@ protected: TNetwork &Network; TCharmap &Charmap; }; - -#endif diff --git a/reactos/base/applications/network/telnet/src/tscript.h b/reactos/base/applications/network/telnet/src/tscript.h index f9626bf7059..1015b1f3ad8 100644 --- a/reactos/base/applications/network/telnet/src/tscript.h +++ b/reactos/base/applications/network/telnet/src/tscript.h @@ -1,5 +1,4 @@ -#ifndef __TSCRIPT_H -#define __TSCRIPT_H +#pragma once #include #include @@ -16,5 +15,3 @@ private: char *script; TNetwork &Network; }; - -#endif diff --git a/reactos/base/applications/network/telnet/src/tscroll.h b/reactos/base/applications/network/telnet/src/tscroll.h index 4261ca0f94c..8a982b29da6 100644 --- a/reactos/base/applications/network/telnet/src/tscroll.h +++ b/reactos/base/applications/network/telnet/src/tscroll.h @@ -1,5 +1,4 @@ -#ifndef __TSCROLL_H -#define __TSCROLL_H +#pragma once #include "tconsole.h" #include "tmouse.h" @@ -22,5 +21,3 @@ public: TScroller(TMouse &M, int size=20000); ~TScroller(); }; - -#endif diff --git a/reactos/base/applications/network/telnet/src/ttelhndl.h b/reactos/base/applications/network/telnet/src/ttelhndl.h index ad4ec627ebc..9879435f01e 100644 --- a/reactos/base/applications/network/telnet/src/ttelhndl.h +++ b/reactos/base/applications/network/telnet/src/ttelhndl.h @@ -1,5 +1,4 @@ -#ifndef __TTELHNDL_H -#define __TTELHNDL_H +#pragma once #include "tparser.h" #include "tnetwork.h" @@ -47,5 +46,3 @@ public: int get_term() {return iTermSet;} }; - -#endif diff --git a/reactos/base/applications/rapps/rapps.h b/reactos/base/applications/rapps/rapps.h index 09a64c273a6..5401b37a317 100644 --- a/reactos/base/applications/rapps/rapps.h +++ b/reactos/base/applications/rapps/rapps.h @@ -1,5 +1,4 @@ -#ifndef _RAPPS_H__ -#define _RAPPS_H__ +#pragma once #include #include @@ -185,5 +184,3 @@ VOID ToolBarOnGetDispInfo(LPTOOLTIPTEXT lpttt); extern HWND hTreeView; BOOL CreateTreeView(HWND hwnd); HTREEITEM TreeViewAddItem(HTREEITEM hParent, LPWSTR lpText, INT Image, INT SelectedImage, LPARAM lParam); - -#endif /* _RAPPS_H__ */ diff --git a/reactos/base/applications/rapps/resource.h b/reactos/base/applications/rapps/resource.h index a4faeae3203..a3b907557d0 100644 --- a/reactos/base/applications/rapps/resource.h +++ b/reactos/base/applications/rapps/resource.h @@ -1,5 +1,4 @@ -#ifndef _RESOURCE_H__ -#define _RESOURCE_H__ +#pragma once /* Icons */ #define IDI_MAIN 10 @@ -152,5 +151,3 @@ #ifndef IDC_STATIC #define IDC_STATIC -1 #endif - -#endif /* _RESOURCE_H__ */ diff --git a/reactos/base/applications/regedit/clb/clbdll.h b/reactos/base/applications/regedit/clb/clbdll.h index bc148d18db1..2680976bb73 100644 --- a/reactos/base/applications/regedit/clb/clbdll.h +++ b/reactos/base/applications/regedit/clb/clbdll.h @@ -1,5 +1,4 @@ -#ifndef __CLBDLL_H -#define __CLBDLL_H +#pragma once #define CLBS_NOTIFY 0x1 #define CLBS_SORT 0x2 @@ -39,5 +38,3 @@ typedef struct _CUSTOM_CONTROL_INFO LRESULT CALLBACK ClbWndProc(HWND,UINT,WPARAM,LPARAM); INT_PTR WINAPI ClbStyleW(HWND,LPARAM); BOOL WINAPI CustomControlInfoW(LPCUSTOM_CONTROL_INFO); - -#endif /* __CLBDLL_H */ diff --git a/reactos/base/applications/regedit/clb/resource.h b/reactos/base/applications/regedit/clb/resource.h index f0d51c721f1..8cfc463c378 100644 --- a/reactos/base/applications/regedit/clb/resource.h +++ b/reactos/base/applications/regedit/clb/resource.h @@ -1,6 +1,3 @@ -#ifndef __CLB_RESOURCE_H -#define __CLB_RESOURCE_H +#pragma once #define IDD_COLUMNLISTBOXSTYLES 1700 - -#endif /* __CLB_RESOURCE_H */ diff --git a/reactos/base/applications/regedit/hexedit.h b/reactos/base/applications/regedit/hexedit.h index d692d38a927..5ee5e22992d 100644 --- a/reactos/base/applications/regedit/hexedit.h +++ b/reactos/base/applications/regedit/hexedit.h @@ -1,5 +1,4 @@ -#ifndef __HEXEDIT_H -#define __HEXEDIT_H +#pragma once #define HEX_EDIT_CLASS_NAME _T("HexEdit32") @@ -36,5 +35,3 @@ UnregisterHexEditorClass(HINSTANCE hInstance); #define HexEdit_SetMaxBufferSize(hWnd, Size) \ SendMessage((hWnd), HEM_SETMAXBUFFERSIZE, 0, (LPARAM)(Size)) - -#endif /* __HEXEDIT_H */ diff --git a/reactos/base/applications/regedit/main.h b/reactos/base/applications/regedit/main.h index 6e22e3e7ae2..ea16ceec7cb 100644 --- a/reactos/base/applications/regedit/main.h +++ b/reactos/base/applications/regedit/main.h @@ -18,8 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __MAIN_H__ -#define __MAIN_H__ +#pragma once #include "resource.h" @@ -124,5 +123,3 @@ extern void DestroyMainMenu( void ); /* edit.c */ extern BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName, BOOL EditBin); extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath); - -#endif /* __MAIN_H__ */ diff --git a/reactos/base/applications/regedit/security.h b/reactos/base/applications/regedit/security.h index 743cca51717..4f6d70dd5ef 100644 --- a/reactos/base/applications/regedit/security.h +++ b/reactos/base/applications/regedit/security.h @@ -1,5 +1,4 @@ -#ifndef _REGEXP_SECURITY_H -#define _REGEXP_SECURITY_H +#pragma once BOOL InitializeAclUiDll(VOID); @@ -154,6 +153,4 @@ typedef struct _CRegKeySecurity TCHAR szRegKey[1]; } CRegKeySecurity, *PCRegKeySecurity; -#endif /* _REGEXP_SECURITY_H */ - /* EOF */ diff --git a/reactos/base/applications/sndvol32/resources.h b/reactos/base/applications/sndvol32/resources.h index 35d525345d2..0272ffecd1c 100644 --- a/reactos/base/applications/sndvol32/resources.h +++ b/reactos/base/applications/sndvol32/resources.h @@ -1,5 +1,4 @@ -#ifndef __SNDVOL_RESOURCES_H -#define __SNDVOL_RESOURCES_H +#pragma once #define IDM_MAINMENU 101 @@ -22,5 +21,3 @@ #define IDS_SNDVOL32 100 #define IDS_NOMIXERDEVICES 101 - -#endif /* __SNDVOL_RESOURCES_H */ diff --git a/reactos/base/applications/taskmgr/about.h b/reactos/base/applications/taskmgr/about.h index 4c62a2f65ef..07269a8f7c7 100644 --- a/reactos/base/applications/taskmgr/about.h +++ b/reactos/base/applications/taskmgr/about.h @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ABOUT_H -#define __ABOUT_H +#pragma once void OnAbout(void); - -#endif /* __ABOUT_H */ diff --git a/reactos/base/applications/taskmgr/affinity.h b/reactos/base/applications/taskmgr/affinity.h index db0b15273f5..7c93801d507 100644 --- a/reactos/base/applications/taskmgr/affinity.h +++ b/reactos/base/applications/taskmgr/affinity.h @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __AFFINITY_H -#define __AFFINITY_H +#pragma once void ProcessPage_OnSetAffinity(void); - -#endif /* __AFFINITY_H */ diff --git a/reactos/base/applications/taskmgr/applpage.h b/reactos/base/applications/taskmgr/applpage.h index 82bb4cfb6ba..f75a76ad2a3 100644 --- a/reactos/base/applications/taskmgr/applpage.h +++ b/reactos/base/applications/taskmgr/applpage.h @@ -20,8 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __APPLICATIONPAGE_H -#define __APPLICATIONPAGE_H +#pragma once extern HWND hApplicationPage; /* Application List Property Page */ @@ -43,5 +42,3 @@ void ApplicationPage_OnWindowsBringToFront(void); void ApplicationPage_OnSwitchTo(void); void ApplicationPage_OnEndTask(void); void ApplicationPage_OnGotoProcess(void); - -#endif /* __APPLICATIONPAGE_H */ diff --git a/reactos/base/applications/taskmgr/column.h b/reactos/base/applications/taskmgr/column.h index 90dc6c42ecb..9aeb3ec4cfd 100644 --- a/reactos/base/applications/taskmgr/column.h +++ b/reactos/base/applications/taskmgr/column.h @@ -20,8 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __COLUMN_H -#define __COLUMN_H +#pragma once #define COLUMN_IMAGENAME 0 #define COLUMN_PID 1 @@ -110,5 +109,3 @@ void ProcessPage_OnViewSelectColumns(void); void AddColumns(void); void SaveColumnSettings(void); void UpdateColumnDataHints(void); - -#endif /* __COLUMN_H */ diff --git a/reactos/base/applications/taskmgr/debug.h b/reactos/base/applications/taskmgr/debug.h index d4ee7adbb24..85041340431 100644 --- a/reactos/base/applications/taskmgr/debug.h +++ b/reactos/base/applications/taskmgr/debug.h @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __DEBUG_H -#define __DEBUG_H +#pragma once void ProcessPage_OnDebug(void); - -#endif /* __DEBUG_H */ diff --git a/reactos/base/applications/taskmgr/endproc.h b/reactos/base/applications/taskmgr/endproc.h index 1238177ee8e..934a4c122be 100644 --- a/reactos/base/applications/taskmgr/endproc.h +++ b/reactos/base/applications/taskmgr/endproc.h @@ -20,10 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ENDPROC_H -#define __ENDPROC_H +#pragma once void ProcessPage_OnEndProcess(void); void ProcessPage_OnEndProcessTree(void); - -#endif /* __ENDPROC_H */ diff --git a/reactos/base/applications/taskmgr/graph.h b/reactos/base/applications/taskmgr/graph.h index 3dd1ea5947f..d990f51f155 100644 --- a/reactos/base/applications/taskmgr/graph.h +++ b/reactos/base/applications/taskmgr/graph.h @@ -20,8 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __GRAPH_H -#define __GRAPH_H +#pragma once #ifdef __cplusplus extern "C" { @@ -41,5 +40,3 @@ INT_PTR CALLBACK Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lP #ifdef __cplusplus }; #endif - -#endif /* __GRAPH_H */ diff --git a/reactos/base/applications/taskmgr/graphctl.h b/reactos/base/applications/taskmgr/graphctl.h index 2d315a31ef9..e924716e3e9 100644 --- a/reactos/base/applications/taskmgr/graphctl.h +++ b/reactos/base/applications/taskmgr/graphctl.h @@ -20,8 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __GRAPH_CTRL_H__ -#define __GRAPH_CTRL_H__ +#pragma once #define MAX_PLOTS 4 #define MAX_CTRLS 4 @@ -110,5 +109,3 @@ INT_PTR CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA #ifdef __cplusplus } #endif - -#endif /* __GRAPH_CTRL_H__ */ diff --git a/reactos/base/applications/taskmgr/optnmenu.h b/reactos/base/applications/taskmgr/optnmenu.h index 9312d38ee2d..50a8251fa42 100644 --- a/reactos/base/applications/taskmgr/optnmenu.h +++ b/reactos/base/applications/taskmgr/optnmenu.h @@ -24,8 +24,7 @@ * Menu item handlers for the options menu. */ -#ifndef __OPTNMENU_H -#define __OPTNMENU_H +#pragma once #define OPTIONS_MENU_INDEX 1 @@ -33,5 +32,3 @@ void TaskManager_OnOptionsAlwaysOnTop(void); void TaskManager_OnOptionsMinimizeOnUse(void); void TaskManager_OnOptionsHideWhenMinimized(void); void TaskManager_OnOptionsShow16BitTasks(void); - -#endif /* __OPTNMENU_H */ diff --git a/reactos/base/applications/taskmgr/perfdata.h b/reactos/base/applications/taskmgr/perfdata.h index 68661f5f5e7..00c2d6dc21a 100644 --- a/reactos/base/applications/taskmgr/perfdata.h +++ b/reactos/base/applications/taskmgr/perfdata.h @@ -20,8 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __PERFDATA_H -#define __PERFDATA_H +#pragma once #ifdef __cplusplus extern "C" { @@ -106,5 +105,3 @@ ULONG PerfDataGetTotalThreadCount(void); #ifdef __cplusplus }; #endif - -#endif /* __PERFDATA_H */ diff --git a/reactos/base/applications/taskmgr/perfpage.h b/reactos/base/applications/taskmgr/perfpage.h index e6ce095be89..f1e4403f37c 100644 --- a/reactos/base/applications/taskmgr/perfpage.h +++ b/reactos/base/applications/taskmgr/perfpage.h @@ -20,8 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __PERFORMANCEPAGE_H -#define __PERFORMANCEPAGE_H +#pragma once #ifdef __cplusplus extern "C" { @@ -37,5 +36,3 @@ void PerformancePage_OnViewCPUHistoryOneGraphPerCPU(void); #ifdef __cplusplus }; #endif - -#endif /* __PERFORMANCEPAGE_H */ diff --git a/reactos/base/applications/taskmgr/precomp.h b/reactos/base/applications/taskmgr/precomp.h index c30856b3065..67272472a48 100644 --- a/reactos/base/applications/taskmgr/precomp.h +++ b/reactos/base/applications/taskmgr/precomp.h @@ -1,5 +1,4 @@ -#ifndef __PRECOMP_H -#define __PRECOMP_H +#pragma once #ifndef UNICODE #error Task-Manager uses NDK functions, so it can only be compiled with Unicode support enabled! @@ -36,5 +35,3 @@ #include "priority.h" #include "run.h" #include "trayicon.h" - -#endif /* __PRECOMP_H */ diff --git a/reactos/base/applications/taskmgr/priority.h b/reactos/base/applications/taskmgr/priority.h index 04bf2b6f901..5d8f18cc468 100644 --- a/reactos/base/applications/taskmgr/priority.h +++ b/reactos/base/applications/taskmgr/priority.h @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __PRIORITY_H -#define __PRIORITY_H +#pragma once void DoSetPriority(DWORD priority); - -#endif /* __PRIORITY_H */ diff --git a/reactos/base/applications/taskmgr/proclist.h b/reactos/base/applications/taskmgr/proclist.h index 1099f1b4a3f..1df2753384b 100644 --- a/reactos/base/applications/taskmgr/proclist.h +++ b/reactos/base/applications/taskmgr/proclist.h @@ -20,11 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __PROCLIST_H -#define __PROCLIST_H +#pragma once INT_PTR CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); extern WNDPROC OldProcessListWndProc; - -#endif /* __PROCLIST_H */ diff --git a/reactos/base/applications/taskmgr/procpage.h b/reactos/base/applications/taskmgr/procpage.h index ac9a57a9151..ff244a9ab6a 100644 --- a/reactos/base/applications/taskmgr/procpage.h +++ b/reactos/base/applications/taskmgr/procpage.h @@ -20,8 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __PROCESSPAGE_H -#define __PROCESSPAGE_H +#pragma once extern HWND hProcessPage; /* Process List Property Page */ extern HWND hProcessPageListCtrl; /* Process ListCtrl Window */ @@ -32,5 +31,3 @@ extern HWND hProcessPageShowAllProcessesButton; /* Process Show All Processes c INT_PTR CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); void RefreshProcessPage(void); DWORD GetSelectedProcessId(void); - -#endif /* __PROCESSPAGE_H */ diff --git a/reactos/base/applications/taskmgr/run.h b/reactos/base/applications/taskmgr/run.h index b71036468c9..ef972ff6ecb 100644 --- a/reactos/base/applications/taskmgr/run.h +++ b/reactos/base/applications/taskmgr/run.h @@ -28,8 +28,7 @@ * jholderness@geocities.com */ -#ifndef __RUN_H -#define __RUN_H +#pragma once void TaskManager_OnFileNew(void); @@ -50,5 +49,3 @@ UINT uFlags); #define RFF_CALCDIRECTORY 0x04 /* Calculates the working directory from the file name. */ #define RFF_NOLABEL 0x08 /* Removes the edit box label. */ #define RFF_NOSEPARATEMEM 0x20 /* Removes the Separate Memory Space check box (Windows NT only). */ - -#endif /* __RUN_H */ diff --git a/reactos/base/applications/taskmgr/taskmgr.h b/reactos/base/applications/taskmgr/taskmgr.h index 22c0b89fa9d..16eaad8224a 100644 --- a/reactos/base/applications/taskmgr/taskmgr.h +++ b/reactos/base/applications/taskmgr/taskmgr.h @@ -20,8 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __TASKMGR_H__ -#define __TASKMGR_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -124,5 +123,3 @@ LPTSTR GetLastErrorText( LPTSTR lpszBuf, DWORD dwSize ); #ifdef __cplusplus } #endif - -#endif /* __TASKMGR_H__ */ diff --git a/reactos/base/applications/taskmgr/trayicon.h b/reactos/base/applications/taskmgr/trayicon.h index f9d4bc5293b..1b51c5571b8 100644 --- a/reactos/base/applications/taskmgr/trayicon.h +++ b/reactos/base/applications/taskmgr/trayicon.h @@ -20,8 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __TRAYICON_H -#define __TRAYICON_H +#pragma once #define WM_ONTRAYICON WM_USER + 5 @@ -29,5 +28,3 @@ HICON TrayIcon_GetProcessorUsageIcon(void); BOOL TrayIcon_ShellAddTrayIcon(void); BOOL TrayIcon_ShellRemoveTrayIcon(void); BOOL TrayIcon_ShellUpdateTrayIcon(void); - -#endif /* __TRAYICON_H */ diff --git a/reactos/base/services/dhcp/include/debug.h b/reactos/base/services/dhcp/include/debug.h index 369b8ee049b..de374aaba45 100644 --- a/reactos/base/services/dhcp/include/debug.h +++ b/reactos/base/services/dhcp/include/debug.h @@ -6,8 +6,8 @@ * DEFINES: DBG - Enable debug output * NASSERT - Disable assertions */ -#ifndef __DEBUG_H -#define __DEBUG_H + +#pragma once #define NORMAL_MASK 0x000000FF #define SPECIAL_MASK 0xFFFFFF00 @@ -48,6 +48,4 @@ extern unsigned long debug_trace_level; #endif /* DBG */ -#endif /* __DEBUG_H */ - /* EOF */ diff --git a/reactos/base/services/dhcp/include/dhcpd.h b/reactos/base/services/dhcp/include/dhcpd.h index 44bae6de878..d6a2fa405b8 100644 --- a/reactos/base/services/dhcp/include/dhcpd.h +++ b/reactos/base/services/dhcp/include/dhcpd.h @@ -39,8 +39,7 @@ * Enterprises, see ``http://www.vix.com''. */ -#ifndef DHCPD_H -#define DHCPD_H +#pragma once #include #include @@ -484,5 +483,3 @@ int buf_add(struct buf *, void *, size_t); int buf_close(int, struct buf *); ssize_t buf_read(int, void *, size_t); void dispatch_imsg(int); - -#endif/*DHCPD_H*/ diff --git a/reactos/base/services/dhcp/include/predec.h b/reactos/base/services/dhcp/include/predec.h index 7f2515beb33..59fb94b003c 100644 --- a/reactos/base/services/dhcp/include/predec.h +++ b/reactos/base/services/dhcp/include/predec.h @@ -1,7 +1,4 @@ -#ifndef REACTOS_PREDEC_H -#define REACTOS_PREDEC_H +#pragma once struct iaddr; struct interface_info; - -#endif diff --git a/reactos/base/services/dhcp/include/stdint.h b/reactos/base/services/dhcp/include/stdint.h index 988c30359e9..a45def0e663 100644 --- a/reactos/base/services/dhcp/include/stdint.h +++ b/reactos/base/services/dhcp/include/stdint.h @@ -1,5 +1,4 @@ -#ifndef REACTOS_STDINT_H -#define REACTOS_STDINT_H +#pragma once typedef signed char int8_t; typedef unsigned char u_int8_t; @@ -9,5 +8,3 @@ typedef int int32_t; typedef unsigned int u_int32_t; typedef char *caddr_t; - -#endif diff --git a/reactos/base/services/svchost/svchost.h b/reactos/base/services/svchost/svchost.h index 390b4d02b0b..539b5772e5f 100644 --- a/reactos/base/services/svchost/svchost.h +++ b/reactos/base/services/svchost/svchost.h @@ -5,8 +5,8 @@ * PURPOSE: Provide dll service loader * PROGRAMMERS: Gregor Brunmar (gregor.brunmar@home.se) */ -#ifndef __SVCHOST_H__ -#define __SVCHOST_H__ + +#pragma once /* INCLUDES ******************************************************************/ @@ -32,7 +32,4 @@ typedef struct _SERVICE { /* FUNCTIONS *****************************************************************/ -#endif /* __SVCHOST_H__ */ - /* EOF */ - diff --git a/reactos/base/services/telnetd/syslog.h b/reactos/base/services/telnetd/syslog.h index 2dbf821961a..ca87a1cb80f 100644 --- a/reactos/base/services/telnetd/syslog.h +++ b/reactos/base/services/telnetd/syslog.h @@ -29,8 +29,7 @@ * @(#)syslog.h 8.1 (Berkeley) 6/2/93 */ -#ifndef _SYS_SYSLOG_H -#define _SYS_SYSLOG_H 1 +#pragma once #include @@ -193,5 +192,3 @@ extern const char* set_syslog_conf_dir( const char* dir ); #ifdef __cplusplus } #endif - -#endif /* syslog.h */ diff --git a/reactos/base/services/telnetd/telnetd.h b/reactos/base/services/telnetd/telnetd.h index afb1199ce05..fe5bd138610 100644 --- a/reactos/base/services/telnetd/telnetd.h +++ b/reactos/base/services/telnetd/telnetd.h @@ -1,5 +1,4 @@ -#ifndef __TELNETD_H -#define __TELNETD_H +#pragma once #define _CRT_SECURE_NO_WARNINGS @@ -82,6 +81,3 @@ static DWORD WINAPI ReadFromPipeThread(LPVOID); static void TerminateShell(client_t *client); static VOID ErrorExit(LPTSTR); int kickoff_telnetd(void); - -#endif /* __TELNETD_H */ - diff --git a/reactos/base/setup/reactos/resource.h b/reactos/base/setup/reactos/resource.h index f8259b7ce93..f4d6b2210bf 100644 --- a/reactos/base/setup/reactos/resource.h +++ b/reactos/base/setup/reactos/resource.h @@ -1,5 +1,4 @@ -#ifndef RESOURCE_H -#define RESOURCE_H +#pragma once #define IDB_WATERMARK 100 #define IDB_HEADER 101 @@ -61,5 +60,3 @@ #define IDC_DEVICEDRIVER 2051 #define IDI_MAIN 3000 - -#endif diff --git a/reactos/base/setup/usetup/bootsup.h b/reactos/base/setup/usetup/bootsup.h index 1303b5be695..a0b012ed32b 100644 --- a/reactos/base/setup/usetup/bootsup.h +++ b/reactos/base/setup/usetup/bootsup.h @@ -24,8 +24,7 @@ * PROGRAMMER: Eric Kohl */ -#ifndef __BOOTSUP_H__ -#define __BOOTSUP_H__ +#pragma once NTSTATUS CreateFreeLoaderIniForDos(PWCHAR IniPath, @@ -83,6 +82,4 @@ NTSTATUS InstallFatBootcodeToFloppy(PUNICODE_STRING SourceRootPath, PUNICODE_STRING DestinationArcPath); -#endif /* __BOOTSUP_H__ */ - /* EOF */ diff --git a/reactos/base/setup/usetup/cabinet.h b/reactos/base/setup/usetup/cabinet.h index 1a7884fd924..711a07f6ac2 100644 --- a/reactos/base/setup/usetup/cabinet.h +++ b/reactos/base/setup/usetup/cabinet.h @@ -4,8 +4,7 @@ * FILE: apps/cabman/cabinet.h * PURPOSE: Cabinet definitions */ -#ifndef __CABINET_H -#define __CABINET_H +#pragma once #include @@ -204,5 +203,3 @@ VOID CabinetSetEventHandlers(PCABINET_OVERWRITE Overwrite, PCABINET_DISK_CHANGE DiskChange); /* Get pointer to cabinet reserved area. NULL if none */ PVOID CabinetGetCabinetReservedArea(PULONG Size); - -#endif /* __CABINET_H */ diff --git a/reactos/base/setup/usetup/chkdsk.h b/reactos/base/setup/usetup/chkdsk.h index 79e21bdbfce..e21196b717d 100644 --- a/reactos/base/setup/usetup/chkdsk.h +++ b/reactos/base/setup/usetup/chkdsk.h @@ -23,14 +23,11 @@ * PROGRAMMER: Hervé Poussineau (hpoussin@reactos.org) */ -#ifndef __CHKDSK_H__ -#define __CHKDSK_H__ +#pragma once NTSTATUS ChkdskPartition( IN PUNICODE_STRING DriveRoot, IN PFILE_SYSTEM_ITEM FileSystem); -#endif /* __CHKDSK_H__ */ - /* EOF */ diff --git a/reactos/base/setup/usetup/drivesup.h b/reactos/base/setup/usetup/drivesup.h index dd4b4192736..287b5a54e60 100644 --- a/reactos/base/setup/usetup/drivesup.h +++ b/reactos/base/setup/usetup/drivesup.h @@ -24,14 +24,11 @@ * PROGRAMMER: Eric Kohl */ -#ifndef __DRIVESUP_H__ -#define __DRIVESUP_H__ +#pragma once NTSTATUS GetSourcePaths(PUNICODE_STRING SourcePath, PUNICODE_STRING SourceRootPath, PUNICODE_STRING SourceRootDir); -#endif /* __DRIVESUP_H__ */ - /* EOF */ diff --git a/reactos/base/setup/usetup/errorcode.h b/reactos/base/setup/usetup/errorcode.h index 90ce8ed6ffb..4ecc11d35d2 100644 --- a/reactos/base/setup/usetup/errorcode.h +++ b/reactos/base/setup/usetup/errorcode.h @@ -24,8 +24,7 @@ * PROGRAMMER: */ -#ifndef __ERROR_CODE_H__ -#define __ERROR_CODE_H__ +#pragma once typedef enum { @@ -70,7 +69,4 @@ typedef enum ERROR_LAST_ERROR_CODE }ERROR_NUMBER; -#endif /* __ERROR_CODE_H__ */ - /* EOF */ - diff --git a/reactos/base/setup/usetup/filequeue.h b/reactos/base/setup/usetup/filequeue.h index 10eec8be767..28829a45fea 100644 --- a/reactos/base/setup/usetup/filequeue.h +++ b/reactos/base/setup/usetup/filequeue.h @@ -24,9 +24,7 @@ * PROGRAMMER: Eric Kohl */ -#ifndef __FILEQUEUE_H__ -#define __FILEQUEUE_H__ - +#pragma once #define SPFILENOTIFY_STARTQUEUE 0x1 #define SPFILENOTIFY_ENDQUEUE 0x2 @@ -104,6 +102,4 @@ SetupCommitFileQueueW(HWND Owner, PSP_FILE_CALLBACK_W MsgHandler, PVOID Context); -#endif /* __FILEQUEUE_H__ */ - /* EOF */ diff --git a/reactos/base/setup/usetup/filesup.h b/reactos/base/setup/usetup/filesup.h index 3ede70976e4..b7aecd8e622 100644 --- a/reactos/base/setup/usetup/filesup.h +++ b/reactos/base/setup/usetup/filesup.h @@ -24,8 +24,7 @@ * PROGRAMMER: Eric Kohl */ -#ifndef __FILESUP_H__ -#define __FILESUP_H__ +#pragma once NTSTATUS SetupCreateDirectory(PWCHAR DirectoryName); @@ -43,7 +42,4 @@ BOOLEAN DoesFileExist(PWSTR PathName, PWSTR FileName); - -#endif /* __FILESUP_H__ */ - /* EOF */ diff --git a/reactos/base/setup/usetup/format.h b/reactos/base/setup/usetup/format.h index 4e58c97ba93..d2784c16e61 100644 --- a/reactos/base/setup/usetup/format.h +++ b/reactos/base/setup/usetup/format.h @@ -24,14 +24,11 @@ * PROGRAMMER: Casper S. Hornstrup (chorns@users.sourceforge.net) */ -#ifndef __FORMAT_H__ -#define __FORMAT_H__ +#pragma once NTSTATUS FormatPartition( IN PUNICODE_STRING DriveRoot, IN PFILE_SYSTEM_ITEM FileSystem); -#endif /* __FILESUP_H__ */ - /* EOF */ diff --git a/reactos/base/setup/usetup/fslist.h b/reactos/base/setup/usetup/fslist.h index 5ae59cd460b..1c84024eeec 100644 --- a/reactos/base/setup/usetup/fslist.h +++ b/reactos/base/setup/usetup/fslist.h @@ -24,8 +24,7 @@ * Casper S. Hornstrup (chorns@users.sourceforge.net) */ -#ifndef __FSLIST_H__ -#define __FSLIST_H__ +#pragma once #include @@ -76,6 +75,4 @@ VOID ScrollUpFileSystemList( IN PFILE_SYSTEM_LIST List); -#endif /* __FSLIST_H__ */ - /* EOF */ diff --git a/reactos/base/setup/usetup/genlist.h b/reactos/base/setup/usetup/genlist.h index 5d30d75d84c..fd5682c9819 100644 --- a/reactos/base/setup/usetup/genlist.h +++ b/reactos/base/setup/usetup/genlist.h @@ -24,8 +24,7 @@ * PROGRAMMER: Eric Kohl */ -#ifndef __GENLIST_H__ -#define __GENLIST_H__ +#pragma once struct _GENERIC_LIST_ENTRY; typedef struct _GENERIC_LIST_ENTRY *PGENERIC_LIST_ENTRY; @@ -97,6 +96,4 @@ RestoreGenericListState(PGENERIC_LIST List); VOID GenericListKeyPress (PGENERIC_LIST List, CHAR AsciChar); -#endif /* __GENLIST_H__ */ - /* EOF */ diff --git a/reactos/base/setup/usetup/inffile.h b/reactos/base/setup/usetup/inffile.h index 491120bb562..52b002db3a9 100644 --- a/reactos/base/setup/usetup/inffile.h +++ b/reactos/base/setup/usetup/inffile.h @@ -24,8 +24,7 @@ * PROGRAMMER: Hervé Poussineau */ -#ifndef __INFFILE_H__ -#define __INFFILE_H__ +#pragma once #ifndef __REACTOS__ @@ -138,6 +137,4 @@ INF_OpenBufferedFileA( VOID INF_SetHeap( IN PVOID Heap); -#endif /* __INFFILE_H__*/ - /* EOF */ diff --git a/reactos/base/setup/usetup/inicache.h b/reactos/base/setup/usetup/inicache.h index 2596324b8ad..bd7dd33510c 100644 --- a/reactos/base/setup/usetup/inicache.h +++ b/reactos/base/setup/usetup/inicache.h @@ -25,9 +25,7 @@ * Eric Kohl */ -#ifndef __INICACHE_H__ -#define __INICACHE_H__ - +#pragma once typedef struct _INICACHEKEY { @@ -126,7 +124,4 @@ PINICACHESECTION IniCacheAppendSection(PINICACHE Cache, PWCHAR Name); - -#endif /* __INICACHE_H__ */ - /* EOF */ diff --git a/reactos/base/setup/usetup/interface/consup.h b/reactos/base/setup/usetup/interface/consup.h index 7dc7d77531f..98be6dbf435 100644 --- a/reactos/base/setup/usetup/interface/consup.h +++ b/reactos/base/setup/usetup/interface/consup.h @@ -24,8 +24,7 @@ * PROGRAMMER: Eric Kohl */ -#ifndef __CONSUP_H__ -#define __CONSUP_H__ +#pragma once #define FOREGROUND_WHITE (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE) #define FOREGROUND_YELLOW (FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN) @@ -187,6 +186,4 @@ CONSOLE_SetStyledText( IN INT Flags, IN LPCSTR Text); -#endif /* __CONSOLE_H__*/ - /* EOF */ diff --git a/reactos/base/setup/usetup/lang/af-ZA.h b/reactos/base/setup/usetup/lang/af-ZA.h index 7d706c9bf0b..53d9a03c96c 100644 --- a/reactos/base/setup/usetup/lang/af-ZA.h +++ b/reactos/base/setup/usetup/lang/af-ZA.h @@ -1,5 +1,4 @@ -#ifndef LANG_AF_ZA_H__ -#define LANG_AF_ZA_H__ +#pragma once MUI_LAYOUTS afZALayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS afZALayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-AE.h b/reactos/base/setup/usetup/lang/ar-AE.h index 006db05635e..82de046736a 100644 --- a/reactos/base/setup/usetup/lang/ar-AE.h +++ b/reactos/base/setup/usetup/lang/ar-AE.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_AE_H__ -#define LANG_AR_AE_H__ +#pragma once MUI_LAYOUTS arAELayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arAELayouts[] = { L"3801", L"00000401" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-BH.h b/reactos/base/setup/usetup/lang/ar-BH.h index 077483ffc15..4672e1fa81f 100644 --- a/reactos/base/setup/usetup/lang/ar-BH.h +++ b/reactos/base/setup/usetup/lang/ar-BH.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_BH_H__ -#define LANG_AR_BH_H__ +#pragma once MUI_LAYOUTS arBHLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arBHLayouts[] = { L"3C01", L"00000401" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-DZ.h b/reactos/base/setup/usetup/lang/ar-DZ.h index 35b789a0904..b0e8ec96983 100644 --- a/reactos/base/setup/usetup/lang/ar-DZ.h +++ b/reactos/base/setup/usetup/lang/ar-DZ.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_DZ_H__ -#define LANG_AR_DZ_H__ +#pragma once MUI_LAYOUTS arDZLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arDZLayouts[] = { L"1401", L"00020401" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-EG.h b/reactos/base/setup/usetup/lang/ar-EG.h index 00a0afb448c..23488ed7cbe 100644 --- a/reactos/base/setup/usetup/lang/ar-EG.h +++ b/reactos/base/setup/usetup/lang/ar-EG.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_EG_H__ -#define LANG_AR_EG_H__ +#pragma once MUI_LAYOUTS arEGLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arEGLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-IQ.h b/reactos/base/setup/usetup/lang/ar-IQ.h index 7640fe422b4..d0fb958c734 100644 --- a/reactos/base/setup/usetup/lang/ar-IQ.h +++ b/reactos/base/setup/usetup/lang/ar-IQ.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_IQ_H__ -#define LANG_AR_IQ_H__ +#pragma once MUI_LAYOUTS arIQLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arIQLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-JO.h b/reactos/base/setup/usetup/lang/ar-JO.h index 997f64d6deb..cc5a4a1cb56 100644 --- a/reactos/base/setup/usetup/lang/ar-JO.h +++ b/reactos/base/setup/usetup/lang/ar-JO.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_JO_H__ -#define LANG_AR_JO_H__ +#pragma once MUI_LAYOUTS arJOLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arJOLayouts[] = { L"2C01", L"00000401" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-KW.h b/reactos/base/setup/usetup/lang/ar-KW.h index 58f1823e107..d61d382decd 100644 --- a/reactos/base/setup/usetup/lang/ar-KW.h +++ b/reactos/base/setup/usetup/lang/ar-KW.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_KW_H__ -#define LANG_AR_KW_H__ +#pragma once MUI_LAYOUTS arKWLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arKWLayouts[] = { L"3401", L"00000401" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-LB.h b/reactos/base/setup/usetup/lang/ar-LB.h index c4ae8956548..f43c6a66225 100644 --- a/reactos/base/setup/usetup/lang/ar-LB.h +++ b/reactos/base/setup/usetup/lang/ar-LB.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_LB_H__ -#define LANG_AR_LB_H__ +#pragma once MUI_LAYOUTS arLBLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arLBLayouts[] = { L"3001", L"00000401" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-LY.h b/reactos/base/setup/usetup/lang/ar-LY.h index d06eebf0a89..8fdc9770889 100644 --- a/reactos/base/setup/usetup/lang/ar-LY.h +++ b/reactos/base/setup/usetup/lang/ar-LY.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_LY_H__ -#define LANG_AR_LY_H__ +#pragma once MUI_LAYOUTS arLYLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arLYLayouts[] = { L"1001", L"00020401" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-MA.h b/reactos/base/setup/usetup/lang/ar-MA.h index 47b8637f3b2..d6e056b9f5f 100644 --- a/reactos/base/setup/usetup/lang/ar-MA.h +++ b/reactos/base/setup/usetup/lang/ar-MA.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_MA_H__ -#define LANG_AR_MA_H__ +#pragma once MUI_LAYOUTS arMALayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arMALayouts[] = { L"1801", L"00020401" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-OM.h b/reactos/base/setup/usetup/lang/ar-OM.h index ff49fc25127..183b32ee77b 100644 --- a/reactos/base/setup/usetup/lang/ar-OM.h +++ b/reactos/base/setup/usetup/lang/ar-OM.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_OM_H__ -#define LANG_AR_OM_H__ +#pragma once MUI_LAYOUTS arOMLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arOMLayouts[] = { L"2001", L"00000401" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-QA.h b/reactos/base/setup/usetup/lang/ar-QA.h index c9e27ca5f70..bf6cb20f269 100644 --- a/reactos/base/setup/usetup/lang/ar-QA.h +++ b/reactos/base/setup/usetup/lang/ar-QA.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_QA_H__ -#define LANG_AR_QA_H__ +#pragma once MUI_LAYOUTS arQALayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arQALayouts[] = { L"4001", L"00000401" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-SA.h b/reactos/base/setup/usetup/lang/ar-SA.h index 541d9d713b6..403d2a008af 100644 --- a/reactos/base/setup/usetup/lang/ar-SA.h +++ b/reactos/base/setup/usetup/lang/ar-SA.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_SA_H__ -#define LANG_AR_SA_H__ +#pragma once MUI_LAYOUTS arSALayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arSALayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-SY.h b/reactos/base/setup/usetup/lang/ar-SY.h index 93dbe9b8583..8f4b9bb710e 100644 --- a/reactos/base/setup/usetup/lang/ar-SY.h +++ b/reactos/base/setup/usetup/lang/ar-SY.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_SY_H__ -#define LANG_AR_SY_H__ +#pragma once MUI_LAYOUTS arSYLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arSYLayouts[] = { L"2801", L"00000401" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-TN.h b/reactos/base/setup/usetup/lang/ar-TN.h index 2d70266f965..051164872be 100644 --- a/reactos/base/setup/usetup/lang/ar-TN.h +++ b/reactos/base/setup/usetup/lang/ar-TN.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_TN_H__ -#define LANG_AR_TN_H__ +#pragma once MUI_LAYOUTS arTNLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arTNLayouts[] = { L"1C01", L"00020401" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ar-YE.h b/reactos/base/setup/usetup/lang/ar-YE.h index eea30b10da3..19d029ee311 100644 --- a/reactos/base/setup/usetup/lang/ar-YE.h +++ b/reactos/base/setup/usetup/lang/ar-YE.h @@ -1,5 +1,4 @@ -#ifndef LANG_AR_YE_H__ -#define LANG_AR_YE_H__ +#pragma once MUI_LAYOUTS arYELayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS arYELayouts[] = { L"2401", L"00000401" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/az-AZ.h b/reactos/base/setup/usetup/lang/az-AZ.h index 8bee21d93a6..f2056baafe4 100644 --- a/reactos/base/setup/usetup/lang/az-AZ.h +++ b/reactos/base/setup/usetup/lang/az-AZ.h @@ -1,5 +1,4 @@ -#ifndef LANG_AZ_AZ_H__ -#define LANG_AZ_AZ_H__ +#pragma once MUI_LAYOUTS azAZLayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS azAZLayouts[] = { L"0419", L"00000419" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/be-BY.h b/reactos/base/setup/usetup/lang/be-BY.h index f42248012b4..de08d3e0c15 100644 --- a/reactos/base/setup/usetup/lang/be-BY.h +++ b/reactos/base/setup/usetup/lang/be-BY.h @@ -1,5 +1,4 @@ -#ifndef LANG_BE_BY_H__ -#define LANG_BE_BY_H__ +#pragma once MUI_LAYOUTS beBYLayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS beBYLayouts[] = { L"0419", L"00000419" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/bg-BG.h b/reactos/base/setup/usetup/lang/bg-BG.h index 612ccd99181..23bd1f4ebf3 100644 --- a/reactos/base/setup/usetup/lang/bg-BG.h +++ b/reactos/base/setup/usetup/lang/bg-BG.h @@ -1,5 +1,4 @@ -#ifndef LANG_BG_BG_H__ -#define LANG_BG_BG_H__ +#pragma once MUI_LAYOUTS bgBGLayouts[] = { @@ -1706,5 +1705,3 @@ MUI_STRING bgBGStrings[] = "„®¡ ¢ï­¥ ­  ª« ¢¨ âãà­¨ ¯®¤à¥¤¡¨"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ca-ES.h b/reactos/base/setup/usetup/lang/ca-ES.h index f8c006876c8..f2f6234ba0e 100644 --- a/reactos/base/setup/usetup/lang/ca-ES.h +++ b/reactos/base/setup/usetup/lang/ca-ES.h @@ -1,5 +1,4 @@ -#ifndef LANG_CA_ES_H__ -#define LANG_CA_ES_H__ +#pragma once MUI_LAYOUTS caESLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS caESLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/cs-CZ.h b/reactos/base/setup/usetup/lang/cs-CZ.h index d4521e253d0..b3397e14751 100644 --- a/reactos/base/setup/usetup/lang/cs-CZ.h +++ b/reactos/base/setup/usetup/lang/cs-CZ.h @@ -4,8 +4,7 @@ * UPDATED: 2008-06-05 */ -#ifndef LANG_CS_CZ_H__ -#define LANG_CS_CZ_H__ +#pragma once MUI_LAYOUTS csCZLayouts[] = { @@ -1702,5 +1701,3 @@ MUI_STRING csCZStrings[] = "Pýid v m rozlo§en¡ kl ves"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/da-DK.h b/reactos/base/setup/usetup/lang/da-DK.h index a160ad71cd1..627064a4992 100644 --- a/reactos/base/setup/usetup/lang/da-DK.h +++ b/reactos/base/setup/usetup/lang/da-DK.h @@ -1,5 +1,4 @@ -#ifndef LANG_DA_DK_H__ -#define LANG_DA_DK_H__ +#pragma once MUI_LAYOUTS daDKLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS daDKLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/de-AT.h b/reactos/base/setup/usetup/lang/de-AT.h index 3c86dfc0092..289c2080fcc 100644 --- a/reactos/base/setup/usetup/lang/de-AT.h +++ b/reactos/base/setup/usetup/lang/de-AT.h @@ -1,5 +1,4 @@ -#ifndef LANG_DE_AT_H__ -#define LANG_DE_AT_H__ +#pragma once MUI_LAYOUTS deATLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS deATLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/de-CH.h b/reactos/base/setup/usetup/lang/de-CH.h index a217cd86b9c..de472e6c532 100644 --- a/reactos/base/setup/usetup/lang/de-CH.h +++ b/reactos/base/setup/usetup/lang/de-CH.h @@ -1,5 +1,4 @@ -#ifndef LANG_DE_CH_H__ -#define LANG_DE_CH_H__ +#pragma once MUI_LAYOUTS deCHLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS deCHLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/de-DE.h b/reactos/base/setup/usetup/lang/de-DE.h index c585bd9885c..e21b2ffc001 100644 --- a/reactos/base/setup/usetup/lang/de-DE.h +++ b/reactos/base/setup/usetup/lang/de-DE.h @@ -1,5 +1,4 @@ -#ifndef LANG_DE_DE_H__ -#define LANG_DE_DE_H__ +#pragma once MUI_LAYOUTS deDELayouts[] = { @@ -1695,5 +1694,3 @@ MUI_STRING deDEStrings[] = "Tastaturlayout hinzufügen"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/de-LI.h b/reactos/base/setup/usetup/lang/de-LI.h index b34c6834287..425688ee1c0 100644 --- a/reactos/base/setup/usetup/lang/de-LI.h +++ b/reactos/base/setup/usetup/lang/de-LI.h @@ -1,5 +1,4 @@ -#ifndef LANG_DE_LI_H__ -#define LANG_DE_LI_H__ +#pragma once MUI_LAYOUTS deLILayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS deLILayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/de-LU.h b/reactos/base/setup/usetup/lang/de-LU.h index 2c7f683b575..21956e9ff24 100644 --- a/reactos/base/setup/usetup/lang/de-LU.h +++ b/reactos/base/setup/usetup/lang/de-LU.h @@ -1,5 +1,4 @@ -#ifndef LANG_DE_LU_H__ -#define LANG_DE_LU_H__ +#pragma once MUI_LAYOUTS deLULayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS deLULayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/dv-MV.h b/reactos/base/setup/usetup/lang/dv-MV.h index 90f33c4c490..b96b1e2fda2 100644 --- a/reactos/base/setup/usetup/lang/dv-MV.h +++ b/reactos/base/setup/usetup/lang/dv-MV.h @@ -1,5 +1,4 @@ -#ifndef LANG_DV_MV_H__ -#define LANG_DV_MV_H__ +#pragma once MUI_LAYOUTS dvMVLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS dvMVLayouts[] = { L"0465", L"00000465" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/el-GR.h b/reactos/base/setup/usetup/lang/el-GR.h index 861bae50902..e04f530f674 100644 --- a/reactos/base/setup/usetup/lang/el-GR.h +++ b/reactos/base/setup/usetup/lang/el-GR.h @@ -1,5 +1,4 @@ -#ifndef LANG_EL_GR_H__ -#define LANG_EL_GR_H__ +#pragma once MUI_LAYOUTS elGRLayouts[] = { @@ -1724,5 +1723,3 @@ MUI_STRING elGRStrings[] = "‚夜«˜  §¨¦©Ÿã¡ž «à¤ › ˜«á¥œà¤ §¢ž¡«¨¦¢¦šå¦¬"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/en-AU.h b/reactos/base/setup/usetup/lang/en-AU.h index 2e50aa9ff68..ffa3b865e83 100644 --- a/reactos/base/setup/usetup/lang/en-AU.h +++ b/reactos/base/setup/usetup/lang/en-AU.h @@ -1,10 +1,7 @@ -#ifndef LANG_EN_AU_H__ -#define LANG_EN_AU_H__ +#pragma once MUI_LAYOUTS enAULayouts[] = { { L"0C09", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/en-BZ.h b/reactos/base/setup/usetup/lang/en-BZ.h index 09c3d52aa85..4c34df80e4e 100644 --- a/reactos/base/setup/usetup/lang/en-BZ.h +++ b/reactos/base/setup/usetup/lang/en-BZ.h @@ -1,10 +1,7 @@ -#ifndef LANG_EN_BZ_H__ -#define LANG_EN_BZ_H__ +#pragma once MUI_LAYOUTS enBZLayouts[] = { { L"2809", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/en-CA.h b/reactos/base/setup/usetup/lang/en-CA.h index 3c50f83d03a..98000aed71a 100644 --- a/reactos/base/setup/usetup/lang/en-CA.h +++ b/reactos/base/setup/usetup/lang/en-CA.h @@ -1,5 +1,4 @@ -#ifndef LANG_EN_CA_H__ -#define LANG_EN_CA_H__ +#pragma once MUI_LAYOUTS enCALayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS enCALayouts[] = { L"1009", L"00001009" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/en-CB.h b/reactos/base/setup/usetup/lang/en-CB.h index 6dd41f4359d..e014b335b87 100644 --- a/reactos/base/setup/usetup/lang/en-CB.h +++ b/reactos/base/setup/usetup/lang/en-CB.h @@ -1,10 +1,7 @@ -#ifndef LANG_EN_CB_H__ -#define LANG_EN_CB_H__ +#pragma once MUI_LAYOUTS enCBLayouts[] = { { L"2409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/en-GB.h b/reactos/base/setup/usetup/lang/en-GB.h index e147fb794c1..58fe5034d9e 100644 --- a/reactos/base/setup/usetup/lang/en-GB.h +++ b/reactos/base/setup/usetup/lang/en-GB.h @@ -1,10 +1,7 @@ -#ifndef LANG_EN_GB_H__ -#define LANG_EN_GB_H__ +#pragma once MUI_LAYOUTS enGBLayouts[] = { { L"0809", L"00000809" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/en-IE.h b/reactos/base/setup/usetup/lang/en-IE.h index db9ee2462e8..e41db1e4184 100644 --- a/reactos/base/setup/usetup/lang/en-IE.h +++ b/reactos/base/setup/usetup/lang/en-IE.h @@ -1,5 +1,4 @@ -#ifndef LANG_EN_IE_H__ -#define LANG_EN_IE_H__ +#pragma once MUI_LAYOUTS enIELayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS enIELayouts[] = { L"1809", L"00011809" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/en-JM.h b/reactos/base/setup/usetup/lang/en-JM.h index a7122f4403e..0b9567609ae 100644 --- a/reactos/base/setup/usetup/lang/en-JM.h +++ b/reactos/base/setup/usetup/lang/en-JM.h @@ -1,10 +1,7 @@ -#ifndef LANG_EN_JM_H__ -#define LANG_EN_JM_H__ +#pragma once MUI_LAYOUTS enJMLayouts[] = { { L"2009", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/en-NZ.h b/reactos/base/setup/usetup/lang/en-NZ.h index 241d8ef732a..33eb865810a 100644 --- a/reactos/base/setup/usetup/lang/en-NZ.h +++ b/reactos/base/setup/usetup/lang/en-NZ.h @@ -1,10 +1,7 @@ -#ifndef LANG_EN_NZ_H__ -#define LANG_EN_NZ_H__ +#pragma once MUI_LAYOUTS enNZLayouts[] = { { L"1409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/en-PH.h b/reactos/base/setup/usetup/lang/en-PH.h index b525130dd0e..88273d280ad 100644 --- a/reactos/base/setup/usetup/lang/en-PH.h +++ b/reactos/base/setup/usetup/lang/en-PH.h @@ -1,10 +1,7 @@ -#ifndef LANG_EN_PH_H__ -#define LANG_EN_PH_H__ +#pragma once MUI_LAYOUTS enPHLayouts[] = { { L"3409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/en-TT.h b/reactos/base/setup/usetup/lang/en-TT.h index e6866273f54..e167cfc103a 100644 --- a/reactos/base/setup/usetup/lang/en-TT.h +++ b/reactos/base/setup/usetup/lang/en-TT.h @@ -1,10 +1,7 @@ -#ifndef LANG_EN_TT_H__ -#define LANG_EN_TT_H__ +#pragma once MUI_LAYOUTS enTTLayouts[] = { { L"2C09", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/en-US.h b/reactos/base/setup/usetup/lang/en-US.h index 34d9d892b4f..ac694c98c54 100644 --- a/reactos/base/setup/usetup/lang/en-US.h +++ b/reactos/base/setup/usetup/lang/en-US.h @@ -1,5 +1,4 @@ -#ifndef LANG_EN_US_H__ -#define LANG_EN_US_H__ +#pragma once MUI_LAYOUTS enUSLayouts[] = { @@ -1693,5 +1692,3 @@ MUI_STRING enUSStrings[] = "Adding keyboard layouts"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/en-ZA.h b/reactos/base/setup/usetup/lang/en-ZA.h index cf5d1f3e1c5..59ceabf5019 100644 --- a/reactos/base/setup/usetup/lang/en-ZA.h +++ b/reactos/base/setup/usetup/lang/en-ZA.h @@ -1,10 +1,7 @@ -#ifndef LANG_EN_ZA_H__ -#define LANG_EN_ZA_H__ +#pragma once MUI_LAYOUTS enZALayouts[] = { { L"1C09", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/en-ZW.h b/reactos/base/setup/usetup/lang/en-ZW.h index 23dabb7db62..917bd6c9e91 100644 --- a/reactos/base/setup/usetup/lang/en-ZW.h +++ b/reactos/base/setup/usetup/lang/en-ZW.h @@ -1,10 +1,7 @@ -#ifndef LANG_EN_ZW_H__ -#define LANG_EN_ZW_H__ +#pragma once MUI_LAYOUTS enZWLayouts[] = { { L"3009", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/eo-AA.h b/reactos/base/setup/usetup/lang/eo-AA.h index 15c7c992c67..3b72dcf961d 100644 --- a/reactos/base/setup/usetup/lang/eo-AA.h +++ b/reactos/base/setup/usetup/lang/eo-AA.h @@ -1,5 +1,4 @@ -#ifndef LANG_EO_AA_H__ -#define LANG_EO_AA_H__ +#pragma once MUI_LAYOUTS eoAALayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS eoAALayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-AR.h b/reactos/base/setup/usetup/lang/es-AR.h index c427b8d4065..4e36f4aa278 100644 --- a/reactos/base/setup/usetup/lang/es-AR.h +++ b/reactos/base/setup/usetup/lang/es-AR.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_AR_H__ -#define LANG_ES_AR_H__ +#pragma once MUI_LAYOUTS esARLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esARLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-BO.h b/reactos/base/setup/usetup/lang/es-BO.h index 69e4957b56a..f7e210d1283 100644 --- a/reactos/base/setup/usetup/lang/es-BO.h +++ b/reactos/base/setup/usetup/lang/es-BO.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_BO_H__ -#define LANG_ES_BO_H__ +#pragma once MUI_LAYOUTS esBOLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esBOLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-CL.h b/reactos/base/setup/usetup/lang/es-CL.h index 1222675ed71..88704431994 100644 --- a/reactos/base/setup/usetup/lang/es-CL.h +++ b/reactos/base/setup/usetup/lang/es-CL.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_CL_H__ -#define LANG_ES_CL_H__ +#pragma once MUI_LAYOUTS esCLLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esCLLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-CO.h b/reactos/base/setup/usetup/lang/es-CO.h index 9e6e569f39f..3b36be43327 100644 --- a/reactos/base/setup/usetup/lang/es-CO.h +++ b/reactos/base/setup/usetup/lang/es-CO.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_CO_H__ -#define LANG_ES_CO_H__ +#pragma once MUI_LAYOUTS esCOLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esCOLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-CR.h b/reactos/base/setup/usetup/lang/es-CR.h index d66e39f29cc..eff1db06fba 100644 --- a/reactos/base/setup/usetup/lang/es-CR.h +++ b/reactos/base/setup/usetup/lang/es-CR.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_CR_H__ -#define LANG_ES_CR_H__ +#pragma once MUI_LAYOUTS esCRLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esCRLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-DO.h b/reactos/base/setup/usetup/lang/es-DO.h index 5a474dc34ae..3987c8c7317 100644 --- a/reactos/base/setup/usetup/lang/es-DO.h +++ b/reactos/base/setup/usetup/lang/es-DO.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_DO_H__ -#define LANG_ES_DO_H__ +#pragma once MUI_LAYOUTS esDOLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esDOLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-EC.h b/reactos/base/setup/usetup/lang/es-EC.h index 9627211c702..ea54ab71312 100644 --- a/reactos/base/setup/usetup/lang/es-EC.h +++ b/reactos/base/setup/usetup/lang/es-EC.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_EC_H__ -#define LANG_ES_EC_H__ +#pragma once MUI_LAYOUTS esECLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esECLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-ES.h b/reactos/base/setup/usetup/lang/es-ES.h index ef516888c13..d951d6b564f 100644 --- a/reactos/base/setup/usetup/lang/es-ES.h +++ b/reactos/base/setup/usetup/lang/es-ES.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_ES_H__ -#define LANG_ES_ES_H__ +#pragma once MUI_LAYOUTS esESLayouts[] = { @@ -1694,5 +1693,3 @@ MUI_STRING esESStrings[] = "Adding keyboard layouts"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-GT.h b/reactos/base/setup/usetup/lang/es-GT.h index 184f57a53ea..5d99a5de347 100644 --- a/reactos/base/setup/usetup/lang/es-GT.h +++ b/reactos/base/setup/usetup/lang/es-GT.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_GT_H__ -#define LANG_ES_GT_H__ +#pragma once MUI_LAYOUTS esGTLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esGTLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-HN.h b/reactos/base/setup/usetup/lang/es-HN.h index 7564bc6a701..14d5ab9f6af 100644 --- a/reactos/base/setup/usetup/lang/es-HN.h +++ b/reactos/base/setup/usetup/lang/es-HN.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_HN_H__ -#define LANG_ES_HN_H__ +#pragma once MUI_LAYOUTS esHNLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esHNLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-MX.h b/reactos/base/setup/usetup/lang/es-MX.h index 0ebe7fc9463..da0bd621d22 100644 --- a/reactos/base/setup/usetup/lang/es-MX.h +++ b/reactos/base/setup/usetup/lang/es-MX.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_MX_H__ -#define LANG_ES_MX_H__ +#pragma once MUI_LAYOUTS esMXLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esMXLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-NI.h b/reactos/base/setup/usetup/lang/es-NI.h index cf9142a00b6..c570367d9b1 100644 --- a/reactos/base/setup/usetup/lang/es-NI.h +++ b/reactos/base/setup/usetup/lang/es-NI.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_NI_H__ -#define LANG_ES_NI_H__ +#pragma once MUI_LAYOUTS esNILayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esNILayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-PA.h b/reactos/base/setup/usetup/lang/es-PA.h index 38693e8bfe3..81bf70c1c98 100644 --- a/reactos/base/setup/usetup/lang/es-PA.h +++ b/reactos/base/setup/usetup/lang/es-PA.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_PA_H__ -#define LANG_ES_PA_H__ +#pragma once MUI_LAYOUTS esPALayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esPALayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-PE.h b/reactos/base/setup/usetup/lang/es-PE.h index 97090ac930d..970402bcf96 100644 --- a/reactos/base/setup/usetup/lang/es-PE.h +++ b/reactos/base/setup/usetup/lang/es-PE.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_PE_H__ -#define LANG_ES_PE_H__ +#pragma once MUI_LAYOUTS esPELayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esPELayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-PR.h b/reactos/base/setup/usetup/lang/es-PR.h index 02492dc3ae3..e9acb60cac3 100644 --- a/reactos/base/setup/usetup/lang/es-PR.h +++ b/reactos/base/setup/usetup/lang/es-PR.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_PR_H__ -#define LANG_ES_PR_H__ +#pragma once MUI_LAYOUTS esPRLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esPRLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-PY.h b/reactos/base/setup/usetup/lang/es-PY.h index f5c476e8482..640d700b70c 100644 --- a/reactos/base/setup/usetup/lang/es-PY.h +++ b/reactos/base/setup/usetup/lang/es-PY.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_PY_H__ -#define LANG_ES_PY_H__ +#pragma once MUI_LAYOUTS esPYLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esPYLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-SV.h b/reactos/base/setup/usetup/lang/es-SV.h index d2f96b73715..18a8c9c4f93 100644 --- a/reactos/base/setup/usetup/lang/es-SV.h +++ b/reactos/base/setup/usetup/lang/es-SV.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_SV_H__ -#define LANG_ES_SV_H__ +#pragma once MUI_LAYOUTS esSVLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esSVLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-UY.h b/reactos/base/setup/usetup/lang/es-UY.h index b8ae8d1780c..a007b24c39f 100644 --- a/reactos/base/setup/usetup/lang/es-UY.h +++ b/reactos/base/setup/usetup/lang/es-UY.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_UY_H__ -#define LANG_ES_UY_H__ +#pragma once MUI_LAYOUTS esUYLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esUYLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/es-VE.h b/reactos/base/setup/usetup/lang/es-VE.h index 57cca1d66bb..46baa1c6f0b 100644 --- a/reactos/base/setup/usetup/lang/es-VE.h +++ b/reactos/base/setup/usetup/lang/es-VE.h @@ -1,5 +1,4 @@ -#ifndef LANG_ES_VE_H__ -#define LANG_ES_VE_H__ +#pragma once MUI_LAYOUTS esVELayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS esVELayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/et-EE.h b/reactos/base/setup/usetup/lang/et-EE.h index 29bbd51ca6e..4a1f7bda62b 100644 --- a/reactos/base/setup/usetup/lang/et-EE.h +++ b/reactos/base/setup/usetup/lang/et-EE.h @@ -1,5 +1,4 @@ -#ifndef LANG_ET_EE_H__ -#define LANG_ET_EE_H__ +#pragma once MUI_LAYOUTS etEELayouts[] = { @@ -1691,5 +1690,3 @@ MUI_STRING etEEStrings[] = "Klaviatuuriasetuste lisamine"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/eu-ES.h b/reactos/base/setup/usetup/lang/eu-ES.h index ae9dd39a540..1bc40cf3f96 100644 --- a/reactos/base/setup/usetup/lang/eu-ES.h +++ b/reactos/base/setup/usetup/lang/eu-ES.h @@ -1,5 +1,4 @@ -#ifndef LANG_EU_ES_H__ -#define LANG_EU_ES_H__ +#pragma once MUI_LAYOUTS euESLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS euESLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/fa-IR.h b/reactos/base/setup/usetup/lang/fa-IR.h index 219ae1c4db8..626f2bf969e 100644 --- a/reactos/base/setup/usetup/lang/fa-IR.h +++ b/reactos/base/setup/usetup/lang/fa-IR.h @@ -1,5 +1,4 @@ -#ifndef LANG_FA_IR_H__ -#define LANG_FA_IR_H__ +#pragma once MUI_LAYOUTS faIRLayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS faIRLayouts[] = { L"0429", L"00000401" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/fi-FI.h b/reactos/base/setup/usetup/lang/fi-FI.h index db363d7b1e1..096db150de0 100644 --- a/reactos/base/setup/usetup/lang/fi-FI.h +++ b/reactos/base/setup/usetup/lang/fi-FI.h @@ -1,5 +1,4 @@ -#ifndef LANG_FI_FI_H__ -#define LANG_FI_FI_H__ +#pragma once MUI_LAYOUTS fiFILayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS fiFILayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/fo-FO.h b/reactos/base/setup/usetup/lang/fo-FO.h index cede112ea52..01b190b0d17 100644 --- a/reactos/base/setup/usetup/lang/fo-FO.h +++ b/reactos/base/setup/usetup/lang/fo-FO.h @@ -1,5 +1,4 @@ -#ifndef LANG_FO_FO_H__ -#define LANG_FO_FO_H__ +#pragma once MUI_LAYOUTS foFOLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS foFOLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/fr-BE.h b/reactos/base/setup/usetup/lang/fr-BE.h index cee512f6fbb..994e4dd75bd 100644 --- a/reactos/base/setup/usetup/lang/fr-BE.h +++ b/reactos/base/setup/usetup/lang/fr-BE.h @@ -1,5 +1,4 @@ -#ifndef LANG_FR_BE_H__ -#define LANG_FR_BE_H__ +#pragma once MUI_LAYOUTS frBELayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS frBELayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/fr-CA.h b/reactos/base/setup/usetup/lang/fr-CA.h index e0ff26a5d91..918a421f741 100644 --- a/reactos/base/setup/usetup/lang/fr-CA.h +++ b/reactos/base/setup/usetup/lang/fr-CA.h @@ -1,5 +1,4 @@ -#ifndef LANG_FR_CA_H__ -#define LANG_FR_CA_H__ +#pragma once MUI_LAYOUTS frCALayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS frCALayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/fr-CH.h b/reactos/base/setup/usetup/lang/fr-CH.h index c6e2378ffd7..8b083c1bcad 100644 --- a/reactos/base/setup/usetup/lang/fr-CH.h +++ b/reactos/base/setup/usetup/lang/fr-CH.h @@ -1,5 +1,4 @@ -#ifndef LANG_FR_CH_H__ -#define LANG_FR_CH_H__ +#pragma once MUI_LAYOUTS frCHLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS frCHLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/fr-FR.h b/reactos/base/setup/usetup/lang/fr-FR.h index 9bea8230836..ae037aba25f 100644 --- a/reactos/base/setup/usetup/lang/fr-FR.h +++ b/reactos/base/setup/usetup/lang/fr-FR.h @@ -1,5 +1,4 @@ -#ifndef LANG_FR_FR_H__ -#define LANG_FR_FR_H__ +#pragma once MUI_LAYOUTS frFRLayouts[] = { @@ -1707,5 +1706,3 @@ MUI_STRING frFRStrings[] = "Adding keyboard layouts"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/fr-LU.h b/reactos/base/setup/usetup/lang/fr-LU.h index 0a50dbdd121..18fb3a7d623 100644 --- a/reactos/base/setup/usetup/lang/fr-LU.h +++ b/reactos/base/setup/usetup/lang/fr-LU.h @@ -1,5 +1,4 @@ -#ifndef LANG_FR_LU_H__ -#define LANG_FR_LU_H__ +#pragma once MUI_LAYOUTS frLULayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS frLULayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/fr-MC.h b/reactos/base/setup/usetup/lang/fr-MC.h index 6e564feae00..1720d0a5fce 100644 --- a/reactos/base/setup/usetup/lang/fr-MC.h +++ b/reactos/base/setup/usetup/lang/fr-MC.h @@ -1,5 +1,4 @@ -#ifndef LANG_FR_MC_H__ -#define LANG_FR_MC_H__ +#pragma once MUI_LAYOUTS frMCLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS frMCLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/gl-ES.h b/reactos/base/setup/usetup/lang/gl-ES.h index 35dcf5ec1f2..31acfd370cf 100644 --- a/reactos/base/setup/usetup/lang/gl-ES.h +++ b/reactos/base/setup/usetup/lang/gl-ES.h @@ -1,5 +1,4 @@ -#ifndef LANG_GL_ES_H__ -#define LANG_GL_ES_H__ +#pragma once MUI_LAYOUTS glESLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS glESLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/gu-IN.h b/reactos/base/setup/usetup/lang/gu-IN.h index 5443e1dc3ec..c0cb2cbf21a 100644 --- a/reactos/base/setup/usetup/lang/gu-IN.h +++ b/reactos/base/setup/usetup/lang/gu-IN.h @@ -1,5 +1,4 @@ -#ifndef LANG_GU_IN_H__ -#define LANG_GU_IN_H__ +#pragma once MUI_LAYOUTS guINLayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS guINLayouts[] = { L"0439", L"00000439" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/he-IL.h b/reactos/base/setup/usetup/lang/he-IL.h index c981fe70b02..9c18824630c 100644 --- a/reactos/base/setup/usetup/lang/he-IL.h +++ b/reactos/base/setup/usetup/lang/he-IL.h @@ -1,5 +1,4 @@ -#ifndef LANG_HE_IL_H__ -#define LANG_HE_IL_H__ +#pragma once MUI_LAYOUTS heILLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS heILLayouts[] = { L"040D", L"0000040D" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/hi-IN.h b/reactos/base/setup/usetup/lang/hi-IN.h index b01731728fb..caf0c3d8917 100644 --- a/reactos/base/setup/usetup/lang/hi-IN.h +++ b/reactos/base/setup/usetup/lang/hi-IN.h @@ -1,5 +1,4 @@ -#ifndef LANG_HI_IN_H__ -#define LANG_HI_IN_H__ +#pragma once MUI_LAYOUTS hiINLayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS hiINLayouts[] = { L"0439", L"00000439" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/hr-HR.h b/reactos/base/setup/usetup/lang/hr-HR.h index 8622ea5339b..33a62e2873b 100644 --- a/reactos/base/setup/usetup/lang/hr-HR.h +++ b/reactos/base/setup/usetup/lang/hr-HR.h @@ -1,5 +1,4 @@ -#ifndef LANG_HR_HR_H__ -#define LANG_HR_HR_H__ +#pragma once MUI_LAYOUTS hrHRLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS hrHRLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/hu-HU.h b/reactos/base/setup/usetup/lang/hu-HU.h index fc57399808d..a59208b6bb8 100644 --- a/reactos/base/setup/usetup/lang/hu-HU.h +++ b/reactos/base/setup/usetup/lang/hu-HU.h @@ -1,5 +1,4 @@ -#ifndef LANG_HU_HU_H__ -#define LANG_HU_HU_H__ +#pragma once MUI_LAYOUTS huHULayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS huHULayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/hy-AM.h b/reactos/base/setup/usetup/lang/hy-AM.h index 8499622fd3c..249c6d67c53 100644 --- a/reactos/base/setup/usetup/lang/hy-AM.h +++ b/reactos/base/setup/usetup/lang/hy-AM.h @@ -1,5 +1,4 @@ -#ifndef LANG_HY_AM_H__ -#define LANG_HY_AM_H__ +#pragma once MUI_LAYOUTS hyAMLayouts[] = { @@ -9,5 +8,3 @@ MUI_LAYOUTS hyAMLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/id-ID.h b/reactos/base/setup/usetup/lang/id-ID.h index 2346f239152..0cd4cebfa94 100644 --- a/reactos/base/setup/usetup/lang/id-ID.h +++ b/reactos/base/setup/usetup/lang/id-ID.h @@ -1,5 +1,4 @@ -#ifndef LANG_ID_ID_H__ -#define LANG_ID_ID_H__ +#pragma once MUI_LAYOUTS idIDLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS idIDLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/is-IS.h b/reactos/base/setup/usetup/lang/is-IS.h index e23d530f496..aad013eab52 100644 --- a/reactos/base/setup/usetup/lang/is-IS.h +++ b/reactos/base/setup/usetup/lang/is-IS.h @@ -1,5 +1,4 @@ -#ifndef LANG_IS_IS_H__ -#define LANG_IS_IS_H__ +#pragma once MUI_LAYOUTS isISLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS isISLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/it-CH.h b/reactos/base/setup/usetup/lang/it-CH.h index f0cbd7c4f83..eb6748bd4bf 100644 --- a/reactos/base/setup/usetup/lang/it-CH.h +++ b/reactos/base/setup/usetup/lang/it-CH.h @@ -1,5 +1,4 @@ -#ifndef LANG_IT_CH_H__ -#define LANG_IT_CH_H__ +#pragma once MUI_LAYOUTS itCHLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS itCHLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/it-IT.h b/reactos/base/setup/usetup/lang/it-IT.h index 56f73a76890..21d3d8990bf 100644 --- a/reactos/base/setup/usetup/lang/it-IT.h +++ b/reactos/base/setup/usetup/lang/it-IT.h @@ -1,5 +1,4 @@ -#ifndef LANG_IT_IT_H__ -#define LANG_IT_IT_H__ +#pragma once MUI_LAYOUTS itITLayouts[] = { @@ -1695,5 +1694,3 @@ MUI_STRING itITStrings[] = "Aggiunta delle nazionalit… di tastiera"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ja-JP.h b/reactos/base/setup/usetup/lang/ja-JP.h index c444450ac62..af7ccdf2a7e 100644 --- a/reactos/base/setup/usetup/lang/ja-JP.h +++ b/reactos/base/setup/usetup/lang/ja-JP.h @@ -1,5 +1,4 @@ -#ifndef LANG_JA_JP_H__ -#define LANG_JA_JP_H__ +#pragma once MUI_LAYOUTS jaJPLayouts[] = { @@ -1694,5 +1693,3 @@ MUI_STRING jaJPStrings[] = "·°ÎÞ°ÄÞ Ú²±³ÄÉ Â²¶ Á­³"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ka-GE.h b/reactos/base/setup/usetup/lang/ka-GE.h index 1c90f06b12b..c1036087b82 100644 --- a/reactos/base/setup/usetup/lang/ka-GE.h +++ b/reactos/base/setup/usetup/lang/ka-GE.h @@ -1,5 +1,4 @@ -#ifndef LANG_KA_GE_H__ -#define LANG_KA_GE_H__ +#pragma once MUI_LAYOUTS kaGELayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS kaGELayouts[] = { L"0419", L"00000419" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/kk-KZ.h b/reactos/base/setup/usetup/lang/kk-KZ.h index 64d7e297fe7..86723663b94 100644 --- a/reactos/base/setup/usetup/lang/kk-KZ.h +++ b/reactos/base/setup/usetup/lang/kk-KZ.h @@ -1,5 +1,4 @@ -#ifndef LANG_KK_KZ_H__ -#define LANG_KK_KZ_H__ +#pragma once MUI_LAYOUTS kkKZLayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS kkKZLayouts[] = { L"0419", L"00000419" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/kn-IN.h b/reactos/base/setup/usetup/lang/kn-IN.h index 241ff8700cc..1441331ed5e 100644 --- a/reactos/base/setup/usetup/lang/kn-IN.h +++ b/reactos/base/setup/usetup/lang/kn-IN.h @@ -1,5 +1,4 @@ -#ifndef LANG_KN_IN_H__ -#define LANG_KN_IN_H__ +#pragma once MUI_LAYOUTS knINLayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS knINLayouts[] = { L"0439", L"00010439" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ko-KR.h b/reactos/base/setup/usetup/lang/ko-KR.h index 4f805a88f22..799ae3ab1f1 100644 --- a/reactos/base/setup/usetup/lang/ko-KR.h +++ b/reactos/base/setup/usetup/lang/ko-KR.h @@ -1,5 +1,4 @@ -#ifndef LANG_KO_KR_H__ -#define LANG_KO_KR_H__ +#pragma once MUI_LAYOUTS koKRLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS koKRLayouts[] = { L"0412", L"00000412" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/kok-IN.h b/reactos/base/setup/usetup/lang/kok-IN.h index ea9b692a2fa..cbfcab3437a 100644 --- a/reactos/base/setup/usetup/lang/kok-IN.h +++ b/reactos/base/setup/usetup/lang/kok-IN.h @@ -1,5 +1,4 @@ -#ifndef LANG_KOK_IN_H__ -#define LANG_KOK_IN_H__ +#pragma once MUI_LAYOUTS kokINLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS kokINLayouts[] = { L"0457", L"00000439" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ky-KG.h b/reactos/base/setup/usetup/lang/ky-KG.h index b6571f61f88..e71b40cf2e9 100644 --- a/reactos/base/setup/usetup/lang/ky-KG.h +++ b/reactos/base/setup/usetup/lang/ky-KG.h @@ -1,5 +1,4 @@ -#ifndef LANG_KY_KG_H__ -#define LANG_KY_KG_H__ +#pragma once MUI_LAYOUTS kyKGLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS kyKGLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/lt-LT.h b/reactos/base/setup/usetup/lang/lt-LT.h index 7d455c2634c..a0a9eb485bf 100644 --- a/reactos/base/setup/usetup/lang/lt-LT.h +++ b/reactos/base/setup/usetup/lang/lt-LT.h @@ -7,8 +7,7 @@ * DATE: 2008-01-06 */ -#ifndef LANG_LT_LT_H__ -#define LANG_LT_LT_H__ +#pragma once MUI_LAYOUTS ltLTLayouts[] = { @@ -1704,5 +1703,3 @@ MUI_STRING ltLTStrings[] = "Adding keyboard layouts"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/lv-LV.h b/reactos/base/setup/usetup/lang/lv-LV.h index 23ca79b96ab..8371a2369bd 100644 --- a/reactos/base/setup/usetup/lang/lv-LV.h +++ b/reactos/base/setup/usetup/lang/lv-LV.h @@ -1,10 +1,7 @@ -#ifndef LANG_LV_LV_H__ -#define LANG_LV_LV_H__ +#pragma once MUI_LAYOUTS lvLVLayouts[] = { { L"0426", L"00010426" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/mk-MK.h b/reactos/base/setup/usetup/lang/mk-MK.h index 1405f6438c0..4acab642d53 100644 --- a/reactos/base/setup/usetup/lang/mk-MK.h +++ b/reactos/base/setup/usetup/lang/mk-MK.h @@ -1,5 +1,4 @@ -#ifndef LANG_MK_MK_H__ -#define LANG_MK_MK_H__ +#pragma once MUI_LAYOUTS mkMKLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS mkMKLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/mn-MN.h b/reactos/base/setup/usetup/lang/mn-MN.h index f503f99c53b..6dec34de4c3 100644 --- a/reactos/base/setup/usetup/lang/mn-MN.h +++ b/reactos/base/setup/usetup/lang/mn-MN.h @@ -1,5 +1,4 @@ -#ifndef LANG_MN_MN_H__ -#define LANG_MN_MN_H__ +#pragma once MUI_LAYOUTS mnMNLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS mnMNLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/mr-IN.h b/reactos/base/setup/usetup/lang/mr-IN.h index 58840e927bd..ff2e09ba19d 100644 --- a/reactos/base/setup/usetup/lang/mr-IN.h +++ b/reactos/base/setup/usetup/lang/mr-IN.h @@ -1,5 +1,4 @@ -#ifndef LANG_MR_IN_H__ -#define LANG_MR_IN_H__ +#pragma once MUI_LAYOUTS mrINLayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS mrINLayouts[] = { L"044E", L"00000439" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ms-BN.h b/reactos/base/setup/usetup/lang/ms-BN.h index 24ef23d8cbe..e0563c8665b 100644 --- a/reactos/base/setup/usetup/lang/ms-BN.h +++ b/reactos/base/setup/usetup/lang/ms-BN.h @@ -1,10 +1,7 @@ -#ifndef LANG_MS_BN_H__ -#define LANG_MS_BN_H__ +#pragma once MUI_LAYOUTS msBNLayouts[] = { { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ms-MY.h b/reactos/base/setup/usetup/lang/ms-MY.h index 1abc1a33039..646eb6a90f9 100644 --- a/reactos/base/setup/usetup/lang/ms-MY.h +++ b/reactos/base/setup/usetup/lang/ms-MY.h @@ -1,10 +1,7 @@ -#ifndef LANG_MS_MY_H__ -#define LANG_MS_MY_H__ +#pragma once MUI_LAYOUTS msMYLayouts[] = { { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/my-MM.h b/reactos/base/setup/usetup/lang/my-MM.h index f02d95e26b1..9b732ad7a92 100644 --- a/reactos/base/setup/usetup/lang/my-MM.h +++ b/reactos/base/setup/usetup/lang/my-MM.h @@ -1,5 +1,4 @@ -#ifndef LANG_MY_MM_H__ -#define LANG_MY_MM_H__ +#pragma once MUI_LAYOUTS myMMLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS myMMLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/nl-BE.h b/reactos/base/setup/usetup/lang/nl-BE.h index 233697b42c0..ebf61e67f81 100644 --- a/reactos/base/setup/usetup/lang/nl-BE.h +++ b/reactos/base/setup/usetup/lang/nl-BE.h @@ -1,5 +1,4 @@ -#ifndef LANG_NL_BE_H__ -#define LANG_NL_BE_H__ +#pragma once MUI_LAYOUTS nlBELayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS nlBELayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/nl-NL.h b/reactos/base/setup/usetup/lang/nl-NL.h index 484b7ead78f..eba2d93ad5c 100644 --- a/reactos/base/setup/usetup/lang/nl-NL.h +++ b/reactos/base/setup/usetup/lang/nl-NL.h @@ -1,5 +1,4 @@ -#ifndef LANG_NL_NL_H__ -#define LANG_NL_NL_H__ +#pragma once MUI_LAYOUTS nlNLLayouts[] = { @@ -1722,6 +1721,3 @@ MUI_STRING nlNLStrings[] = "Toevoegen toetsenbord indelingen"}, {0, 0} }; - - -#endif diff --git a/reactos/base/setup/usetup/lang/nn-NO.h b/reactos/base/setup/usetup/lang/nn-NO.h index 4032b676814..8597b7405eb 100644 --- a/reactos/base/setup/usetup/lang/nn-NO.h +++ b/reactos/base/setup/usetup/lang/nn-NO.h @@ -1,5 +1,4 @@ -#ifndef LANG_NN_NO_H__ -#define LANG_NN_NO_H__ +#pragma once MUI_LAYOUTS nnNOLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS nnNOLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/pa-IN.h b/reactos/base/setup/usetup/lang/pa-IN.h index 44be5985a03..44cc3c30e6b 100644 --- a/reactos/base/setup/usetup/lang/pa-IN.h +++ b/reactos/base/setup/usetup/lang/pa-IN.h @@ -1,5 +1,4 @@ -#ifndef LANG_PA_IN_H__ -#define LANG_PA_IN_H__ +#pragma once MUI_LAYOUTS paINLayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS paINLayouts[] = { L"0439", L"00010439" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/pl-PL.h b/reactos/base/setup/usetup/lang/pl-PL.h index dde0dbdc8c3..8d4262d58cd 100644 --- a/reactos/base/setup/usetup/lang/pl-PL.h +++ b/reactos/base/setup/usetup/lang/pl-PL.h @@ -5,8 +5,7 @@ * IRC: irc.freenode.net #reactos-pl; */ -#ifndef LANG_PL_PL_H__ -#define LANG_PL_PL_H__ +#pragma once MUI_LAYOUTS plPLLayouts[] = { @@ -1703,5 +1702,3 @@ MUI_STRING plPLStrings[] = "Dodawanie ukˆad¢w klawiatury"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/pt-BR.h b/reactos/base/setup/usetup/lang/pt-BR.h index f1623f9fa8f..6c545ad785a 100644 --- a/reactos/base/setup/usetup/lang/pt-BR.h +++ b/reactos/base/setup/usetup/lang/pt-BR.h @@ -1,5 +1,4 @@ -#ifndef LANG_PT_BR_H__ -#define LANG_PT_BR_H__ +#pragma once MUI_LAYOUTS ptBRLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS ptBRLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/pt-PT.h b/reactos/base/setup/usetup/lang/pt-PT.h index 6ca8d287221..6faf386505c 100644 --- a/reactos/base/setup/usetup/lang/pt-PT.h +++ b/reactos/base/setup/usetup/lang/pt-PT.h @@ -1,5 +1,4 @@ -#ifndef LANG_PT_PT_H__ -#define LANG_PT_PT_H__ +#pragma once MUI_LAYOUTS ptPTLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS ptPTLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/rm-CH.h b/reactos/base/setup/usetup/lang/rm-CH.h index 62e9e753116..d36a5e632df 100644 --- a/reactos/base/setup/usetup/lang/rm-CH.h +++ b/reactos/base/setup/usetup/lang/rm-CH.h @@ -1,5 +1,4 @@ -#ifndef LANG_RM_CH_H__ -#define LANG_RM_CH_H__ +#pragma once MUI_LAYOUTS rmCHLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS rmCHLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ro-RO.h b/reactos/base/setup/usetup/lang/ro-RO.h index 8ee875b2585..f8f17441a26 100644 --- a/reactos/base/setup/usetup/lang/ro-RO.h +++ b/reactos/base/setup/usetup/lang/ro-RO.h @@ -1,5 +1,4 @@ -#ifndef LANG_RO_RO_H__ -#define LANG_RO_RO_H__ +#pragma once MUI_LAYOUTS roROLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS roROLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ru-RU.h b/reactos/base/setup/usetup/lang/ru-RU.h index ea25d6c10aa..7e55b9700bb 100644 --- a/reactos/base/setup/usetup/lang/ru-RU.h +++ b/reactos/base/setup/usetup/lang/ru-RU.h @@ -1,5 +1,4 @@ -#ifndef LANG_RU_RU_H__ -#define LANG_RU_RU_H__ +#pragma once MUI_LAYOUTS ruRULayouts[] = { @@ -1695,5 +1694,3 @@ MUI_STRING ruRUStrings[] = "Adding keyboard layouts"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/sa-IN.h b/reactos/base/setup/usetup/lang/sa-IN.h index b186ff42fc9..8d8442dcb72 100644 --- a/reactos/base/setup/usetup/lang/sa-IN.h +++ b/reactos/base/setup/usetup/lang/sa-IN.h @@ -1,5 +1,4 @@ -#ifndef LANG_SA_IN_H__ -#define LANG_SA_IN_H__ +#pragma once MUI_LAYOUTS saINLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS saINLayouts[] = { L"044F", L"00000439" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/sk-SK.h b/reactos/base/setup/usetup/lang/sk-SK.h index 76596451626..5078f08139f 100644 --- a/reactos/base/setup/usetup/lang/sk-SK.h +++ b/reactos/base/setup/usetup/lang/sk-SK.h @@ -4,8 +4,7 @@ * LastChange: 01-11-2009 */ -#ifndef LANG_SK_SK_H__ -#define LANG_SK_SK_H__ +#pragma once MUI_LAYOUTS skSKLayouts[] = { @@ -1705,5 +1704,3 @@ MUI_STRING skSKStrings[] = "Prid vam rozlo§enia kl vesnice"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/sl-SI.h b/reactos/base/setup/usetup/lang/sl-SI.h index 9278ee7d728..29a0133383c 100644 --- a/reactos/base/setup/usetup/lang/sl-SI.h +++ b/reactos/base/setup/usetup/lang/sl-SI.h @@ -1,5 +1,4 @@ -#ifndef LANG_SL_SI_H__ -#define LANG_SL_SI_H__ +#pragma once MUI_LAYOUTS slSILayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS slSILayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/sq-AL.h b/reactos/base/setup/usetup/lang/sq-AL.h index 74afcc3dff2..21027ea9166 100644 --- a/reactos/base/setup/usetup/lang/sq-AL.h +++ b/reactos/base/setup/usetup/lang/sq-AL.h @@ -1,5 +1,4 @@ -#ifndef LANG_SQ_AL_H__ -#define LANG_SQ_AL_H__ +#pragma once MUI_LAYOUTS sqALLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS sqALLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/sr-SP.h b/reactos/base/setup/usetup/lang/sr-SP.h index 0a2d81a8028..022248a7fbf 100644 --- a/reactos/base/setup/usetup/lang/sr-SP.h +++ b/reactos/base/setup/usetup/lang/sr-SP.h @@ -1,5 +1,4 @@ -#ifndef LANG_SR_SP_H__ -#define LANG_SR_SP_H__ +#pragma once MUI_LAYOUTS srSPLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS srSPLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/sv-FI.h b/reactos/base/setup/usetup/lang/sv-FI.h index b377d7f7e05..c90085576e9 100644 --- a/reactos/base/setup/usetup/lang/sv-FI.h +++ b/reactos/base/setup/usetup/lang/sv-FI.h @@ -1,5 +1,4 @@ -#ifndef LANG_SV_FI_H__ -#define LANG_SV_FI_H__ +#pragma once MUI_LAYOUTS svFILayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS svFILayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/sv-SE.h b/reactos/base/setup/usetup/lang/sv-SE.h index df25e299e7d..0dbffdc453c 100644 --- a/reactos/base/setup/usetup/lang/sv-SE.h +++ b/reactos/base/setup/usetup/lang/sv-SE.h @@ -1,5 +1,4 @@ -#ifndef LANG_SV_SE_H__ -#define LANG_SV_SE_H__ +#pragma once MUI_LAYOUTS svSELayouts[] = { @@ -1694,5 +1693,3 @@ MUI_STRING svSEStrings[] = "Adding keyboard layouts"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/sw-KE.h b/reactos/base/setup/usetup/lang/sw-KE.h index c73f07d2e7d..3a58152f154 100644 --- a/reactos/base/setup/usetup/lang/sw-KE.h +++ b/reactos/base/setup/usetup/lang/sw-KE.h @@ -1,10 +1,7 @@ -#ifndef LANG_SW_KE_H__ -#define LANG_SW_KE_H__ +#pragma once MUI_LAYOUTS swKELayouts[] = { { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/syr-SY.h b/reactos/base/setup/usetup/lang/syr-SY.h index 02435a2a520..0a5f91cc4ba 100644 --- a/reactos/base/setup/usetup/lang/syr-SY.h +++ b/reactos/base/setup/usetup/lang/syr-SY.h @@ -1,5 +1,4 @@ -#ifndef LANG_SYR_SY_H__ -#define LANG_SYR_SY_H__ +#pragma once MUI_LAYOUTS syrSYLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS syrSYLayouts[] = { L"045A", L"0000045A" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ta-IN.h b/reactos/base/setup/usetup/lang/ta-IN.h index a111ada8c02..9322299c4c4 100644 --- a/reactos/base/setup/usetup/lang/ta-IN.h +++ b/reactos/base/setup/usetup/lang/ta-IN.h @@ -1,5 +1,4 @@ -#ifndef LANG_TA_IN_H__ -#define LANG_TA_IN_H__ +#pragma once MUI_LAYOUTS taINLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS taINLayouts[] = { L"0449", L"00000449" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/te-IN.h b/reactos/base/setup/usetup/lang/te-IN.h index b9072ed9c03..cd80fcc4429 100644 --- a/reactos/base/setup/usetup/lang/te-IN.h +++ b/reactos/base/setup/usetup/lang/te-IN.h @@ -1,5 +1,4 @@ -#ifndef LANG_TE_IN_H__ -#define LANG_TE_IN_H__ +#pragma once MUI_LAYOUTS teINLayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS teINLayouts[] = { L"0439", L"00010439" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/th-TH.h b/reactos/base/setup/usetup/lang/th-TH.h index a0f855fa076..6f50c4217d9 100644 --- a/reactos/base/setup/usetup/lang/th-TH.h +++ b/reactos/base/setup/usetup/lang/th-TH.h @@ -1,5 +1,4 @@ -#ifndef LANG_TH_TH_H__ -#define LANG_TH_TH_H__ +#pragma once MUI_LAYOUTS thTHLayouts[] = { @@ -10,5 +9,3 @@ MUI_LAYOUTS thTHLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/tr-TR.h b/reactos/base/setup/usetup/lang/tr-TR.h index 0920ad02d26..a3c2db5a153 100644 --- a/reactos/base/setup/usetup/lang/tr-TR.h +++ b/reactos/base/setup/usetup/lang/tr-TR.h @@ -1,5 +1,4 @@ -#ifndef LANG_TR_TR_H__ -#define LANG_TR_TR_H__ +#pragma once MUI_LAYOUTS trTRLayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS trTRLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/tt-TA.h b/reactos/base/setup/usetup/lang/tt-TA.h index 93665c43068..b54ebfdc0ba 100644 --- a/reactos/base/setup/usetup/lang/tt-TA.h +++ b/reactos/base/setup/usetup/lang/tt-TA.h @@ -1,5 +1,4 @@ -#ifndef LANG_TT_TA_H__ -#define LANG_TT_TA_H__ +#pragma once MUI_LAYOUTS ttTALayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS ttTALayouts[] = { L"0419", L"00000419" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/uk-UA.h b/reactos/base/setup/usetup/lang/uk-UA.h index e331c0c1a2e..ba3fd009623 100644 --- a/reactos/base/setup/usetup/lang/uk-UA.h +++ b/reactos/base/setup/usetup/lang/uk-UA.h @@ -3,8 +3,7 @@ * http://www.reactos.org/uk/ */ -#ifndef LANG_UK_UA_H__ -#define LANG_UK_UA_H__ +#pragma once MUI_LAYOUTS ukUALayouts[] = { @@ -1700,5 +1699,3 @@ MUI_STRING ukUAStrings[] = "„®¤ ¢ ­­ï ஧ª« ¤®ª ª« ¢i âãà¨"}, {0, 0} }; - -#endif diff --git a/reactos/base/setup/usetup/lang/ur-PK.h b/reactos/base/setup/usetup/lang/ur-PK.h index b1129dee966..73beeee167b 100644 --- a/reactos/base/setup/usetup/lang/ur-PK.h +++ b/reactos/base/setup/usetup/lang/ur-PK.h @@ -1,5 +1,4 @@ -#ifndef LANG_UR_PK_H__ -#define LANG_UR_PK_H__ +#pragma once MUI_LAYOUTS urPKLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS urPKLayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/uz-UZ.h b/reactos/base/setup/usetup/lang/uz-UZ.h index 963c761be35..af15bb90dfb 100644 --- a/reactos/base/setup/usetup/lang/uz-UZ.h +++ b/reactos/base/setup/usetup/lang/uz-UZ.h @@ -1,5 +1,4 @@ -#ifndef LANG_UZ_UZ_H__ -#define LANG_UZ_UZ_H__ +#pragma once MUI_LAYOUTS uzUZLayouts[] = { @@ -8,5 +7,3 @@ MUI_LAYOUTS uzUZLayouts[] = { L"0419", L"00000419" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/vi-VN.h b/reactos/base/setup/usetup/lang/vi-VN.h index 9fed103cb5d..dfd3986f21c 100644 --- a/reactos/base/setup/usetup/lang/vi-VN.h +++ b/reactos/base/setup/usetup/lang/vi-VN.h @@ -1,5 +1,4 @@ -#ifndef LANG_VI_VN_H__ -#define LANG_VI_VN_H__ +#pragma once MUI_LAYOUTS viVNLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS viVNLayouts[] = { L"042A", L"0000042A" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/wa-BE.h b/reactos/base/setup/usetup/lang/wa-BE.h index fbaafe4d09a..7ec2c7861fc 100644 --- a/reactos/base/setup/usetup/lang/wa-BE.h +++ b/reactos/base/setup/usetup/lang/wa-BE.h @@ -1,5 +1,4 @@ -#ifndef LANG_WA_BE_H__ -#define LANG_WA_BE_H__ +#pragma once MUI_LAYOUTS waBELayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS waBELayouts[] = { L"0409", L"00000409" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/zh-CN.h b/reactos/base/setup/usetup/lang/zh-CN.h index 3a1271481c4..d538e74d92a 100644 --- a/reactos/base/setup/usetup/lang/zh-CN.h +++ b/reactos/base/setup/usetup/lang/zh-CN.h @@ -1,5 +1,4 @@ -#ifndef LANG_ZH_CN_H__ -#define LANG_ZH_CN_H__ +#pragma once MUI_LAYOUTS zhCNLayouts[] = { @@ -11,5 +10,3 @@ MUI_LAYOUTS zhCNLayouts[] = { L"0804", L"E0040804" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/zh-HK.h b/reactos/base/setup/usetup/lang/zh-HK.h index 5f99a9dce3b..82905a3a22d 100644 --- a/reactos/base/setup/usetup/lang/zh-HK.h +++ b/reactos/base/setup/usetup/lang/zh-HK.h @@ -1,5 +1,4 @@ -#ifndef LANG_ZH_HK_H__ -#define LANG_ZH_HK_H__ +#pragma once MUI_LAYOUTS zhHKLayouts[] = { @@ -7,5 +6,3 @@ MUI_LAYOUTS zhHKLayouts[] = { L"0C04", L"E0080404" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/zh-MO.h b/reactos/base/setup/usetup/lang/zh-MO.h index 6194ed3ad64..b12866fc0d2 100644 --- a/reactos/base/setup/usetup/lang/zh-MO.h +++ b/reactos/base/setup/usetup/lang/zh-MO.h @@ -1,5 +1,4 @@ -#ifndef LANG_ZH_MO_H__ -#define LANG_ZH_MO_H__ +#pragma once MUI_LAYOUTS zhMOLayouts[] = { @@ -9,5 +8,3 @@ MUI_LAYOUTS zhMOLayouts[] = { L"0404", L"E0080404" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/zh-SG.h b/reactos/base/setup/usetup/lang/zh-SG.h index 038762609ca..f59b1d98c49 100644 --- a/reactos/base/setup/usetup/lang/zh-SG.h +++ b/reactos/base/setup/usetup/lang/zh-SG.h @@ -1,5 +1,4 @@ -#ifndef LANG_ZH_SG_H__ -#define LANG_ZH_SG_H__ +#pragma once MUI_LAYOUTS zhSGLayouts[] = { @@ -10,5 +9,3 @@ MUI_LAYOUTS zhSGLayouts[] = { L"0804", L"E0040804" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/lang/zh-TW.h b/reactos/base/setup/usetup/lang/zh-TW.h index 384a844ef28..a1d3dad959c 100644 --- a/reactos/base/setup/usetup/lang/zh-TW.h +++ b/reactos/base/setup/usetup/lang/zh-TW.h @@ -1,5 +1,4 @@ -#ifndef LANG_ZH_TW_H__ -#define LANG_ZH_TW_H__ +#pragma once MUI_LAYOUTS zhTWLayouts[] = { @@ -9,5 +8,3 @@ MUI_LAYOUTS zhTWLayouts[] = { L"0404", L"E0010404" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/mui.h b/reactos/base/setup/usetup/mui.h index 61722e60612..cf0f718c2e4 100644 --- a/reactos/base/setup/usetup/mui.h +++ b/reactos/base/setup/usetup/mui.h @@ -1,5 +1,4 @@ -#ifndef MUI_H__ -#define MUI_H__ +#pragma once typedef struct { @@ -137,4 +136,3 @@ MUIGetString(ULONG Number); #define STRING_MB 54 #define STRING_GB 55 #define STRING_ADDKBLAYOUTS 56 -#endif diff --git a/reactos/base/setup/usetup/muifonts.h b/reactos/base/setup/usetup/muifonts.h index 399a7eb460d..18e707a7326 100644 --- a/reactos/base/setup/usetup/muifonts.h +++ b/reactos/base/setup/usetup/muifonts.h @@ -1,5 +1,4 @@ -#ifndef LANG_MUI_FONTS_H__ -#define LANG_MUI_FONTS_H__ +#pragma once MUI_SUBFONT LatinFonts[] = { @@ -88,5 +87,3 @@ MUI_SUBFONT UnicodeFonts[] = { L"Helv", L"DejaVu Sans" }, { NULL, NULL } }; - -#endif diff --git a/reactos/base/setup/usetup/muilanguages.h b/reactos/base/setup/usetup/muilanguages.h index 59b11591397..ebf404ac306 100644 --- a/reactos/base/setup/usetup/muilanguages.h +++ b/reactos/base/setup/usetup/muilanguages.h @@ -1,5 +1,4 @@ -#ifndef LANG_MUI_LANGUAGES_H__ -#define LANG_MUI_LANGUAGES_H__ +#pragma once #include "lang/af-ZA.h" #include "lang/ar-AE.h" @@ -281,5 +280,3 @@ const MUI_LANGUAGE LanguageList[] = {L"00000435", L"1252", L"850", L"10000", L"Zulu", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enUSLayouts }, {NULL, NULL, NULL, NULL, NULL, NULL} }; - -#endif diff --git a/reactos/base/setup/usetup/native/host_native.h b/reactos/base/setup/usetup/native/host_native.h index 1ce410db9b2..207927c83eb 100644 --- a/reactos/base/setup/usetup/native/host_native.h +++ b/reactos/base/setup/usetup/native/host_native.h @@ -1,5 +1,4 @@ -#ifndef _HOST_NATIVE_H_ -#define _HOST_NATIVE_H_ +#pragma once #include "usetup.h" @@ -12,5 +11,3 @@ typedef struct #define SetupInitDefaultQueueCallback(a) NULL #define SetupDefaultQueueCallbackW(a, b, c, d) TRUE #define SetupTermDefaultQueueCallback(a) - -#endif /* _HOST_NATIVE_H_ */ diff --git a/reactos/base/setup/usetup/native/utils/console.h b/reactos/base/setup/usetup/native/utils/console.h index e58d4f7caaf..feb89829245 100644 --- a/reactos/base/setup/usetup/native/utils/console.h +++ b/reactos/base/setup/usetup/native/utils/console.h @@ -24,8 +24,7 @@ * PROGRAMMER: Eric Kohl */ -#ifndef _UTILS_CONSOLE_H_ -#define _UTILS_CONSOLE_H_ +#pragma once BOOL WINAPI AllocConsole(VOID); @@ -113,6 +112,4 @@ SetConsoleOutputCP( IN UINT wCodePageID ); -#endif /* _UTILS_CONSOLE_H_ */ - /* EOF */ diff --git a/reactos/base/setup/usetup/native/utils/keytrans.h b/reactos/base/setup/usetup/native/utils/keytrans.h index 8a63a1eeb70..cea1aef5ad3 100644 --- a/reactos/base/setup/usetup/native/utils/keytrans.h +++ b/reactos/base/setup/usetup/native/utils/keytrans.h @@ -23,14 +23,11 @@ * PROGRAMMER: Tinus */ -#ifndef __KEYTRANS_H__ -#define __KEYTRANS_H__ +#pragma once #include NTSTATUS IntTranslateKey(PKEYBOARD_INPUT_DATA InputData, KEY_EVENT_RECORD *Event); -#endif /* __KEYTRANS_H__ */ - /* EOF */ diff --git a/reactos/base/setup/usetup/partlist.h b/reactos/base/setup/usetup/partlist.h index 7d6f08813c4..ef3f4d2cbe0 100644 --- a/reactos/base/setup/usetup/partlist.h +++ b/reactos/base/setup/usetup/partlist.h @@ -23,8 +23,7 @@ * PROGRAMMER: Eric Kohl */ -#ifndef __PARTLIST_H__ -#define __PARTLIST_H__ +#pragma once /* We have to define it there, because it is not in the MS DDK */ #define PARTITION_EXT2 0x83 @@ -222,6 +221,4 @@ CheckForLinuxFdiskPartitions (PPARTLIST List); BOOLEAN WritePartitionsToDisk (PPARTLIST List); -#endif /* __PARTLIST_H__ */ - /* EOF */ diff --git a/reactos/base/setup/usetup/progress.h b/reactos/base/setup/usetup/progress.h index eda1f1ef0bd..53af83db6d9 100644 --- a/reactos/base/setup/usetup/progress.h +++ b/reactos/base/setup/usetup/progress.h @@ -24,9 +24,7 @@ * PROGRAMMER: Eric Kohl */ -#ifndef __PROGRESS_H__ -#define __PROGRESS_H__ - +#pragma once typedef struct _PROGRESS { @@ -75,6 +73,4 @@ VOID ProgressSetStep (PPROGRESSBAR Bar, ULONG Step); -#endif /* __PROGRESS_H__ */ - /* EOF */ diff --git a/reactos/base/setup/usetup/registry.h b/reactos/base/setup/usetup/registry.h index 0b41cd3ea12..d76470402d7 100644 --- a/reactos/base/setup/usetup/registry.h +++ b/reactos/base/setup/usetup/registry.h @@ -24,8 +24,7 @@ * PROGRAMMER: Eric Kohl */ -#ifndef __REGISTRY_H__ -#define __REGISTRY_H__ +#pragma once BOOLEAN ImportRegistryFile(PWSTR Filename, @@ -38,6 +37,4 @@ SetInstallPathValue(PUNICODE_STRING InstallPath); BOOLEAN SetMountedDeviceValue(CHAR Letter, ULONG Signature, LARGE_INTEGER StartingOffset); -#endif /* __REGISTRY_H__ */ - /* EOF */ diff --git a/reactos/base/setup/usetup/settings.h b/reactos/base/setup/usetup/settings.h index 5c6918e8049..65b59ef8aee 100644 --- a/reactos/base/setup/usetup/settings.h +++ b/reactos/base/setup/usetup/settings.h @@ -24,8 +24,7 @@ * PROGRAMMER: Eric Kohl */ -#ifndef __SETTINGS_H__ -#define __SETTINGS_H__ +#pragma once PGENERIC_LIST CreateComputerTypeList(HINF InfFile); @@ -66,6 +65,4 @@ ProcessKeyboardLayoutFiles(PGENERIC_LIST List); BOOLEAN SetGeoID(PWCHAR Id); -#endif /* __SETTINGS_H__ */ - /* EOF */ diff --git a/reactos/base/setup/usetup/usetup.h b/reactos/base/setup/usetup/usetup.h index 2c2aa65d54a..b95ad66347a 100644 --- a/reactos/base/setup/usetup/usetup.h +++ b/reactos/base/setup/usetup/usetup.h @@ -24,8 +24,7 @@ * PROGRAMMER: Eric Kohl */ -#ifndef __USETUP_H__ -#define __USETUP_H__ +#pragma once /* C Headers */ #include @@ -145,6 +144,4 @@ typedef enum _PAGE_NUMBER InsertTailList(current, &((NewEntry)->ListEntryField));\ } -#endif /* __USETUP_H__*/ - /* EOF */ diff --git a/reactos/base/setup/vmwinst/vmwinst.h b/reactos/base/setup/vmwinst/vmwinst.h index f0e9344a913..4fdb1014669 100644 --- a/reactos/base/setup/vmwinst/vmwinst.h +++ b/reactos/base/setup/vmwinst/vmwinst.h @@ -1,5 +1,4 @@ -#ifndef __VMWINST_H -#define __VMWINST_H +#pragma once #ifndef PSCB_BUTTONPRESSED #define PSCB_BUTTONPRESSED (3) @@ -67,5 +66,3 @@ #define IDD_SELECTDRIVERSUBTITLE 352 #define IDD_DOUNINSTALLTITLE 361 #define IDD_DOUNINSTALLSUBTITLE 362 - -#endif /* __VMWINST_H */ diff --git a/reactos/base/shell/cmd/batch.h b/reactos/base/shell/cmd/batch.h index c3a8a0bf4b5..841b09b814f 100644 --- a/reactos/base/shell/cmd/batch.h +++ b/reactos/base/shell/cmd/batch.h @@ -4,8 +4,7 @@ * */ -#ifndef _BATCH_H_INCLUDED_ -#define _BATCH_H_INCLUDED_ +#pragma once typedef struct tagBATCHCONTEXT { @@ -50,5 +49,3 @@ VOID ExitBatch (); INT Batch (LPTSTR, LPTSTR, LPTSTR, PARSED_COMMAND *); LPTSTR ReadBatchLine(); VOID AddBatchRedirection(REDIRECTION **); - -#endif /* _BATCH_H_INCLUDED_ */ diff --git a/reactos/base/shell/cmd/cmd.h b/reactos/base/shell/cmd/cmd.h index 5900e40ad5b..c6605de480f 100644 --- a/reactos/base/shell/cmd/cmd.h +++ b/reactos/base/shell/cmd/cmd.h @@ -21,8 +21,7 @@ * Thanks to Emanuele Aliberti! */ -#ifndef _CMD_H_INCLUDED_ -#define _CMD_H_INCLUDED_ +#pragma once #include "config.h" @@ -492,5 +491,3 @@ INT CommandWindow (LPTSTR); int cmd_if(TCHAR *); int cmd_pause(TCHAR *); int cmd_shift(TCHAR *); - -#endif /* _CMD_H_INCLUDED_ */ diff --git a/reactos/base/shell/cmd/config.h b/reactos/base/shell/cmd/config.h index 18e3093bfff..960f2ab40a4 100644 --- a/reactos/base/shell/cmd/config.h +++ b/reactos/base/shell/cmd/config.h @@ -9,8 +9,7 @@ * */ -#ifndef _CONFIG_H_INCLUDED_ -#define _CONFIG_H_INCLUDED_ +#pragma once #define WIN32_LEAN_AND_MEAN @@ -92,5 +91,3 @@ #ifdef NT4_INTERNAL_COMMANDS #define INCLUDE_CMD_WINDOW #endif - -#endif /* _CONFIG_H_INCLUDED_ */ diff --git a/reactos/base/shell/cmd/precomp.h b/reactos/base/shell/cmd/precomp.h index 915246cceb8..f36368e1d59 100644 --- a/reactos/base/shell/cmd/precomp.h +++ b/reactos/base/shell/cmd/precomp.h @@ -1,5 +1,4 @@ -#ifndef __CMD_PRECOMP_H -#define __CMD_PRECOMP_H +#pragma once #ifdef _MSC_VER #pragma warning ( disable : 4103 ) /* use #pragma pack to change alignment */ @@ -43,5 +42,3 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); #else #define debugstr_aw debugstr_a #endif - -#endif /* __CMD_PRECOMP_H */ diff --git a/reactos/base/shell/explorer-new/comcsup.h b/reactos/base/shell/explorer-new/comcsup.h index 5513ecaa25f..d8a437b928e 100644 --- a/reactos/base/shell/explorer-new/comcsup.h +++ b/reactos/base/shell/explorer-new/comcsup.h @@ -1,5 +1,4 @@ -#ifndef __COMCSUP_H -#define __COMCSUP_H +#pragma once /* ****************************************************************************** @@ -49,5 +48,3 @@ static __inline impl##Impl * \ impl##Impl_from_##iface (iface *ifc) { \ return (impl##Impl *)((ULONG_PTR)ifc - FIELD_OFFSET(impl##Impl, vtbl)); \ } - -#endif /* __COMCSUP_H */ diff --git a/reactos/base/shell/explorer-new/resource.h b/reactos/base/shell/explorer-new/resource.h index aeed8061345..0ab9222f778 100644 --- a/reactos/base/shell/explorer-new/resource.h +++ b/reactos/base/shell/explorer-new/resource.h @@ -1,5 +1,4 @@ -#ifndef __RESOURCE_H -#define __RESOURCE_H +#pragma once #define IDC_STATIC -1 @@ -98,5 +97,3 @@ #define IDC_TASKBARPROP_DESKBANDLIST 2301 #define IDS_TASKBAR_STARTMENU_PROP_CAPTION 2200 - -#endif /* __RESOURCE_H */ diff --git a/reactos/base/shell/explorer-new/todo.h b/reactos/base/shell/explorer-new/todo.h index f0597e60a8b..8efcbe52bb5 100644 --- a/reactos/base/shell/explorer-new/todo.h +++ b/reactos/base/shell/explorer-new/todo.h @@ -1,5 +1,4 @@ -#ifndef __TODO_H -#define __TODO_H +#pragma once #ifdef INTERFACE #undef INTERFACE @@ -40,5 +39,3 @@ static const GUID SID_HACK_SMenuPopup = {0xD1E7AFEB,0x6A2E,0x11D0,{0x8C,0x78,0x0 #define IDeskBarClient_UIActivateDBC(T,a) (T)->lpVtbl->UIActivateDBC(T,a) #define IDeskBarClient_GetSize(T,a,b) (T)->lpVtbl->GetSize(T,a,b) #endif - -#endif /* __TODO_H */ diff --git a/reactos/base/shell/explorer-new/undoc.h b/reactos/base/shell/explorer-new/undoc.h index 46d829eae8c..d2cf78decd7 100644 --- a/reactos/base/shell/explorer-new/undoc.h +++ b/reactos/base/shell/explorer-new/undoc.h @@ -1,5 +1,4 @@ -#ifndef _EXPLORER_UNDOC__H -#define _EXPLORER_UNDOC__H +#pragma once /* * Undocumented stuff @@ -53,5 +52,3 @@ EXTERN_C const GUID CLSID_RebarBandSite; HRESULT WINAPI SHInvokeDefaultCommand(HWND,IShellFolder*,LPCITEMIDLIST); HRESULT WINAPI SHPropertyBag_ReadPOINTL(IPropertyBag*,LPCWSTR,POINTL*); - -#endif /* _EXPLORER_UNDOC__H */ diff --git a/reactos/base/system/runonce/resource.h b/reactos/base/system/runonce/resource.h index 826805f9cc3..96817d435ef 100644 --- a/reactos/base/system/runonce/resource.h +++ b/reactos/base/system/runonce/resource.h @@ -1,10 +1,7 @@ -#ifndef _RESOURCE_H__ -#define _RESOURCE_H__ +#pragma once #define IDI_ICON 10 #define IDD_RUNONCE_DLG 100 #define IDC_COMP_LIST 1000 - -#endif /* _RESOURCE_H__ */ diff --git a/reactos/base/system/runonce/runonce.h b/reactos/base/system/runonce/runonce.h index 6fb2b59bd64..9e9c5849d6c 100644 --- a/reactos/base/system/runonce/runonce.h +++ b/reactos/base/system/runonce/runonce.h @@ -1,9 +1,6 @@ -#ifndef _RUNONCE_H__ -#define _RUNONCE_H__ +#pragma once #include #include #include "resource.h" - -#endif /* _RUNONCE_H__ */ diff --git a/reactos/base/system/smss/smss.h b/reactos/base/system/smss/smss.h index 61f3b4bead4..8c467e566dc 100644 --- a/reactos/base/system/smss/smss.h +++ b/reactos/base/system/smss/smss.h @@ -1,5 +1,4 @@ -#ifndef _SMSS_H_INCLUDED_ -#define _SMSS_H_INCLUDED_ +#pragma once #include #include @@ -113,7 +112,4 @@ NTSTATUS SmInitializeDbgSs(VOID); VOID NTAPI DisplayString(LPCWSTR lpwString); VOID NTAPI PrintString (char* fmt, ...); -#endif /* _SMSS_H_INCLUDED_ */ - /* EOF */ - diff --git a/reactos/base/system/winlogon/setup.h b/reactos/base/system/winlogon/setup.h index efc1d4a3723..d16dbf3b134 100644 --- a/reactos/base/system/winlogon/setup.h +++ b/reactos/base/system/winlogon/setup.h @@ -24,12 +24,9 @@ * PROGRAMMER: Eric Kohl */ -#ifndef __SETUP_H__ -#define __SETUP_H__ +#pragma once DWORD GetSetupType (VOID); BOOL RunSetup (VOID); -#endif /* __SETUP_H__ */ - /* EOF */ diff --git a/reactos/boot/freeldr/fdebug/rs232.h b/reactos/boot/freeldr/fdebug/rs232.h index 8697427f3c9..1e0a3f96391 100644 --- a/reactos/boot/freeldr/fdebug/rs232.h +++ b/reactos/boot/freeldr/fdebug/rs232.h @@ -19,9 +19,7 @@ */ -#ifndef __RS232_H -#define __RS232_H - +#pragma once #ifdef __cplusplus extern "C" { @@ -42,5 +40,3 @@ BOOL Rs232WriteByteWin32(BYTE DataByte); #ifdef __cplusplus } #endif /* __cplusplus */ - -#endif // !defined(__RS232_H) diff --git a/reactos/boot/freeldr/freeldr/arch/powerpc/compat.h b/reactos/boot/freeldr/freeldr/arch/powerpc/compat.h index 66797a6929d..3bc1b7998d7 100644 --- a/reactos/boot/freeldr/freeldr/arch/powerpc/compat.h +++ b/reactos/boot/freeldr/freeldr/arch/powerpc/compat.h @@ -1,5 +1,4 @@ -#ifndef _FREELDR_ARCH_COMPAT_H -#define _FREELDR_ARCH_COMPAT_H +#pragma once #define __init #define __initdata @@ -104,5 +103,3 @@ void *ioremap(__u32 phys, __u32 size); void iounmap(void *logical); __u32 GetPVR(); - -#endif/*_FREELDR_ARCH_COMPAT_H*/ diff --git a/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h b/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h index 710f6caec69..ea03fa0ae1f 100644 --- a/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h +++ b/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h @@ -1,5 +1,4 @@ -#ifndef FREELDR_ARCH_POWERPC_PREP_H -#define FREELDR_ARCH_POWERPC_PREP_H +#pragma once extern struct _pci_desc pci1_desc; extern struct _idectl_desc ide1_desc; @@ -27,5 +26,3 @@ void vga_setup ( PCONFIGURATION_COMPONENT_DATA pci_bus, struct _pci_desc *pci_desc, struct _vga_desc *vga_desc, int bus, int dev, int fn ); - -#endif//FREELDR_ARCH_POWERPC_PREP_H diff --git a/reactos/boot/freeldr/freeldr/include/arch.h b/reactos/boot/freeldr/freeldr/include/arch.h index c3e3c45c307..b9a6cc02386 100644 --- a/reactos/boot/freeldr/freeldr/include/arch.h +++ b/reactos/boot/freeldr/freeldr/include/arch.h @@ -17,9 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -#ifndef __ARCH_H -#define __ARCH_H +#pragma once #ifdef _M_AMD64 #include @@ -176,6 +174,3 @@ VOID SoftReboot(VOID); // Implemented in boot.S VOID DetectHardware(VOID); // Implemented in hardware.c #endif /* ! ASM */ - - -#endif // #defined __ARCH_H diff --git a/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h b/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h index ea7e3800742..af46178d9db 100644 --- a/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h +++ b/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h @@ -18,8 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __AMD64_AMD64_H_ -#define __AMD64_AMD64_H_ +#pragma once // This is needed because headers define wrong one for ReactOS #undef KIP0PCRADDRESS @@ -63,6 +62,4 @@ VOID FrLdrSetupGdtIdt(); #endif -#endif /* __AMD64_AMD64_H_ */ - /* EOF */ diff --git a/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h b/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h index c1252af6916..b6da01e555e 100644 --- a/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h +++ b/reactos/boot/freeldr/freeldr/include/arch/amd64/hardware.h @@ -18,8 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __AMD64_HARDWARE_H_ -#define __AMD64_HARDWARE_H_ +#pragma once #ifndef __REGISTRY_H #include "../../reactos/registry.h" @@ -92,6 +91,4 @@ ULONG PnpBiosGetDeviceNodeCount(ULONG *NodeSize, ULONG PnpBiosGetDeviceNode(UCHAR *NodeId, UCHAR *NodeBuffer); -#endif /* __AMD64_HARDWARE_H_ */ - /* EOF */ diff --git a/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h b/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h index 91ad2d566b4..2efd7e8c74a 100644 --- a/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h +++ b/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h @@ -19,8 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __I386_MACHPC_H_ -#define __I386_MACHPC_H_ +#pragma once #ifndef __MEMORY_H #include "mm.h" @@ -59,6 +58,4 @@ TIMEINFO* PcGetTime(VOID); PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID); -#endif /* __I386_MACHPC_H_ */ - /* EOF */ diff --git a/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h b/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h index 265079c7fc8..1668b4f4daa 100644 --- a/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h +++ b/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h @@ -6,8 +6,7 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -#ifndef _ARM_HARDWARE_ -#define __ARM_HARDWARE_ +#pragma once #ifndef __REGISTRY_H #include "../../reactos/registry.h" @@ -36,5 +35,3 @@ extern ULONG SecondLevelDcacheSize; extern ULONG SecondLevelDcacheFillSize; extern ULONG SecondLevelIcacheSize; extern ULONG SecondLevelIcacheFillSize; - -#endif diff --git a/reactos/boot/freeldr/freeldr/include/arch/i386/custom.h b/reactos/boot/freeldr/freeldr/include/arch/i386/custom.h index 3594c4a1ebb..1ab1dcdfd78 100644 --- a/reactos/boot/freeldr/freeldr/include/arch/i386/custom.h +++ b/reactos/boot/freeldr/freeldr/include/arch/i386/custom.h @@ -17,8 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef __I386_OPTIONS_H -#define __I386_OPTIONS_H +#pragma once #define HAS_OPTION_MENU_CUSTOM_BOOT #define HAS_OPTION_MENU_REBOOT @@ -31,5 +30,3 @@ VOID OptionMenuCustomBootPartition(VOID); VOID OptionMenuCustomBootBootSectorFile(VOID); VOID OptionMenuCustomBootReactOS(VOID); VOID OptionMenuCustomBootLinux(VOID); - -#endif // #defined __I386_OPTIONS_H diff --git a/reactos/boot/freeldr/freeldr/include/arch/i386/drivemap.h b/reactos/boot/freeldr/freeldr/include/arch/i386/drivemap.h index e425fd80d94..aebd893a53b 100644 --- a/reactos/boot/freeldr/freeldr/include/arch/i386/drivemap.h +++ b/reactos/boot/freeldr/freeldr/include/arch/i386/drivemap.h @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __I386_DRIVEMAP_H -#define __I386_DRIVEMAP_H +#pragma once #include typedef struct @@ -38,5 +37,3 @@ extern PVOID DriveMapInt13HandlerStart; extern PVOID DriveMapInt13HandlerEnd; extern ULONG DriveMapOldInt13HandlerAddress; extern DRIVE_MAP_LIST DriveMapInt13HandlerMapList; - -#endif // #defined __I386_DRIVEMAP_H diff --git a/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h b/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h index 6282b266425..c97ba88e9b7 100644 --- a/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h +++ b/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h @@ -18,8 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __I386_HARDWARE_H_ -#define __I386_HARDWARE_H_ +#pragma once #ifndef __REGISTRY_H #include "../../reactos/registry.h" @@ -92,6 +91,4 @@ ULONG PnpBiosGetDeviceNodeCount(ULONG *NodeSize, ULONG PnpBiosGetDeviceNode(UCHAR *NodeId, UCHAR *NodeBuffer); -#endif /* __I386_HARDWARE_H_ */ - /* EOF */ diff --git a/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h b/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h index c58f5953848..faf26b8b8fd 100644 --- a/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h +++ b/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h @@ -18,14 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __I386_I386_H_ -#define __I386_I386_H_ +#pragma once // This is needed because headers define wrong one for ReactOS #undef KIP0PCRADDRESS #define KIP0PCRADDRESS 0xffdff000 - -#endif /* __I386_I386_H_ */ - /* EOF */ diff --git a/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h b/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h index 7cf78767fb1..1cb40b24f10 100644 --- a/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h +++ b/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h @@ -19,8 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __I386_MACHPC_H_ -#define __I386_MACHPC_H_ +#pragma once #ifndef __MEMORY_H #include "mm.h" @@ -58,6 +57,4 @@ TIMEINFO* PcGetTime(VOID); PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID); -#endif /* __I386_MACHPC_H_ */ - /* EOF */ diff --git a/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h b/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h index 5d0cd1e3395..febba0b8636 100644 --- a/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h +++ b/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __I386_MACHXBOX_H_ -#define __I386_MACHXBOX_H_ +#pragma once #ifndef __MEMORY_H #include "mm.h" @@ -63,7 +62,4 @@ PCONFIGURATION_COMPONENT_DATA XboxHwDetect(VOID); VOID XboxSetLED(PCSTR Pattern); - -#endif /* __I386_HWXBOX_H_ */ - /* EOF */ diff --git a/reactos/boot/freeldr/freeldr/include/arch/i386/miscboot.h b/reactos/boot/freeldr/freeldr/include/arch/i386/miscboot.h index 3ee8ab3dac4..df17f558848 100644 --- a/reactos/boot/freeldr/freeldr/include/arch/i386/miscboot.h +++ b/reactos/boot/freeldr/freeldr/include/arch/i386/miscboot.h @@ -17,11 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __I386_BOOT_H -#define __I386_BOOT_H +#pragma once VOID LoadAndBootBootSector(PCSTR OperatingSystemName); VOID LoadAndBootPartition(PCSTR OperatingSystemName); VOID LoadAndBootDrive(PCSTR OperatingSystemName); - -#endif // defined __I386_BOOT_H diff --git a/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h b/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h index da4a99f94fc..9aebb0fbaea 100644 --- a/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h +++ b/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h @@ -18,8 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __POWERPC_HARDWARE_H_ -#define __POWERPC_HARDWARE_H_ +#pragma once #ifndef __REGISTRY_H #include "../../reactos/registry.h" @@ -68,6 +67,4 @@ VOID HalpCalibrateStallExecution(VOID); ULONGLONG RDTSC(VOID); -#endif /* __POWERPC_HARDWARE_H_ */ - /* EOF */ diff --git a/reactos/boot/freeldr/freeldr/include/bytesex.h b/reactos/boot/freeldr/freeldr/include/bytesex.h index ccbfc7cad05..7392ba24cfe 100644 --- a/reactos/boot/freeldr/freeldr/include/bytesex.h +++ b/reactos/boot/freeldr/freeldr/include/bytesex.h @@ -1,5 +1,4 @@ -#ifndef __BYTESEX_H_ -#define __BYTESEX_H_ +#pragma once #ifdef _PPC_ #define SWAPD(x) ((((x)&0xff)<<24)|(((x)&0xff00)<<8)|(((x)>>8)&0xff00)|(((x)>>24)&0xff)) @@ -10,5 +9,3 @@ #endif #define SD(Object,Field) Object->Field = SWAPD(Object->Field) #define SW(Object,Field) Object->Field = SWAPW(Object->Field) - -#endif/*__BYTESEX_H_*/ diff --git a/reactos/boot/freeldr/freeldr/include/cache.h b/reactos/boot/freeldr/freeldr/include/cache.h index cd05fd7c26d..abadfd32c93 100644 --- a/reactos/boot/freeldr/freeldr/include/cache.h +++ b/reactos/boot/freeldr/freeldr/include/cache.h @@ -18,8 +18,7 @@ */ -#ifndef __CACHE_H -#define __CACHE_H +#pragma once /////////////////////////////////////////////////////////////////////////////////////// // @@ -90,5 +89,3 @@ VOID CacheInvalidateCacheData(VOID); BOOLEAN CacheReadDiskSectors(ULONG DiskNumber, ULONG StartSector, ULONG SectorCount, PVOID Buffer); BOOLEAN CacheForceDiskSectorsIntoCache(ULONG DiskNumber, ULONG StartSector, ULONG SectorCount); BOOLEAN CacheReleaseMemory(ULONG MinimumAmountToRelease); - -#endif // defined __CACHE_H diff --git a/reactos/boot/freeldr/freeldr/include/cmdline.h b/reactos/boot/freeldr/freeldr/include/cmdline.h index 1910ef8c0c9..05b92f1410c 100644 --- a/reactos/boot/freeldr/freeldr/include/cmdline.h +++ b/reactos/boot/freeldr/freeldr/include/cmdline.h @@ -18,8 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __CMDLINE_H__ -#define __CMDLINE_H__ +#pragma once typedef struct tagCMDLINEINFO { @@ -32,6 +31,4 @@ void CmdLineParse(char *CmdLine); const char *CmdLineGetDefaultOS(void); LONG CmdLineGetTimeOut(void); -#endif /* __CMDLINE_H__ */ - /* EOF */ diff --git a/reactos/boot/freeldr/freeldr/include/comm.h b/reactos/boot/freeldr/freeldr/include/comm.h index 58ba8594946..511b705de50 100644 --- a/reactos/boot/freeldr/freeldr/include/comm.h +++ b/reactos/boot/freeldr/freeldr/include/comm.h @@ -19,14 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __RS232_H -#define __RS232_H +#pragma once BOOLEAN Rs232PortInitialize(ULONG ComPort, ULONG BaudRate); BOOLEAN Rs232PortGetByte(PUCHAR ByteRecieved); BOOLEAN Rs232PortPollByte(PUCHAR ByteRecieved); VOID Rs232PortPutByte(UCHAR ByteToSend); BOOLEAN Rs232PortInUse(ULONG Base); - - -#endif // defined __RS232_H diff --git a/reactos/boot/freeldr/freeldr/include/disk.h b/reactos/boot/freeldr/freeldr/include/disk.h index a1a09fac410..d29c31ac8c1 100644 --- a/reactos/boot/freeldr/freeldr/include/disk.h +++ b/reactos/boot/freeldr/freeldr/include/disk.h @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __DISK_H -#define __DISK_H +#pragma once #include @@ -141,5 +140,3 @@ BOOLEAN DiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITI BOOLEAN DiskGetFirstPartitionEntry(PMASTER_BOOT_RECORD MasterBootRecord, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN DiskGetFirstExtendedPartitionEntry(PMASTER_BOOT_RECORD MasterBootRecord, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN DiskReadBootRecord(ULONG DriveNumber, ULONGLONG LogicalSectorNumber, PMASTER_BOOT_RECORD BootRecord); - -#endif // defined __DISK_H diff --git a/reactos/boot/freeldr/freeldr/include/fs.h b/reactos/boot/freeldr/freeldr/include/fs.h index 1ecaceaacb2..2aa15257386 100644 --- a/reactos/boot/freeldr/freeldr/include/fs.h +++ b/reactos/boot/freeldr/freeldr/include/fs.h @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __FS_H -#define __FS_H +#pragma once typedef struct tagDEVVTBL { @@ -60,5 +59,3 @@ ULONG FsGetNumPathParts(PCSTR Path); VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path); #define MAX_FDS 60 - -#endif // #defined __FS_H diff --git a/reactos/boot/freeldr/freeldr/include/fs/ext2.h b/reactos/boot/freeldr/freeldr/include/fs/ext2.h index 5189f6ebf45..8a2b518a4be 100644 --- a/reactos/boot/freeldr/freeldr/include/fs/ext2.h +++ b/reactos/boot/freeldr/freeldr/include/fs/ext2.h @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __EXT2_H -#define __EXT2_H +#pragma once /* * grub/fs/ext2.c @@ -237,5 +236,3 @@ typedef struct } EXT2_FILE_INFO, * PEXT2_FILE_INFO; const DEVVTBL* Ext2Mount(ULONG DeviceId); - -#endif // #defined __EXT2_H diff --git a/reactos/boot/freeldr/freeldr/include/fs/fat.h b/reactos/boot/freeldr/freeldr/include/fs/fat.h index 5812f0a80f1..1bf99bfff24 100644 --- a/reactos/boot/freeldr/freeldr/include/fs/fat.h +++ b/reactos/boot/freeldr/freeldr/include/fs/fat.h @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __FAT_H -#define __FAT_H +#pragma once #include typedef struct _FAT_BOOTSECTOR @@ -174,5 +173,3 @@ typedef struct #define ISFATX(FT) ((FT) == FATX16 || (FT) == FATX32) const DEVVTBL* FatMount(ULONG DeviceId); - -#endif // #defined __FAT_H diff --git a/reactos/boot/freeldr/freeldr/include/fs/iso.h b/reactos/boot/freeldr/freeldr/include/fs/iso.h index 957d083b3ff..eacfc970407 100644 --- a/reactos/boot/freeldr/freeldr/include/fs/iso.h +++ b/reactos/boot/freeldr/freeldr/include/fs/iso.h @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __ISO_H -#define __ISO_H +#pragma once #include struct _DIR_RECORD @@ -100,5 +99,3 @@ typedef struct } ISO_FILE_INFO, * PISO_FILE_INFO; const DEVVTBL* IsoMount(ULONG DeviceId); - -#endif // #defined __FAT_H diff --git a/reactos/boot/freeldr/freeldr/include/fs/ntfs.h b/reactos/boot/freeldr/freeldr/include/fs/ntfs.h index 06421f76e99..123508632da 100644 --- a/reactos/boot/freeldr/freeldr/include/fs/ntfs.h +++ b/reactos/boot/freeldr/freeldr/include/fs/ntfs.h @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __NTFS_H -#define __NTFS_H +#pragma once #define NTFS_FILE_MFT 0 #define NTFS_FILE_MFTMIRR 1 @@ -226,5 +225,3 @@ typedef struct #include const DEVVTBL* NtfsMount(ULONG DeviceId); - -#endif // #defined __NTFS_H diff --git a/reactos/boot/freeldr/freeldr/include/inffile.h b/reactos/boot/freeldr/freeldr/include/inffile.h index 938f8b90a84..89afe6de322 100644 --- a/reactos/boot/freeldr/freeldr/include/inffile.h +++ b/reactos/boot/freeldr/freeldr/include/inffile.h @@ -25,9 +25,7 @@ * Eric Kohl */ -#ifndef __INFCACHE_H__ -#define __INFCACHE_H__ - +#pragma once #define STATUS_BAD_SECTION_NAME_LINE (0xC0700001) #define STATUS_SECTION_NAME_TOO_LONG (0xC0700002) @@ -125,6 +123,4 @@ InfGetDataField (PINFCONTEXT Context, ULONG FieldIndex, PCSTR *Data); -#endif /* __INFCACHE_H__ */ - /* EOF */ diff --git a/reactos/boot/freeldr/freeldr/include/inifile.h b/reactos/boot/freeldr/freeldr/include/inifile.h index 72d633e7ac4..ac71d551408 100644 --- a/reactos/boot/freeldr/freeldr/include/inifile.h +++ b/reactos/boot/freeldr/freeldr/include/inifile.h @@ -17,13 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __PARSEINI_H -#define __PARSEINI_H +#pragma once #define INI_FILE_COMMENT_CHAR ';' - - // This structure describes a single .ini file item // The item format in the .ini file is: // Name=Value @@ -78,6 +75,3 @@ BOOLEAN IniReadSettingByNumber(ULONG_PTR SectionId, ULONG SettingNumber, PCHAR S BOOLEAN IniReadSettingByName(ULONG_PTR SectionId, PCSTR SettingName, PCHAR Buffer, ULONG BufferSize); BOOLEAN IniAddSection(PCSTR SectionName, ULONG_PTR* SectionId); BOOLEAN IniAddSettingValueToSection(ULONG_PTR SectionId, PCSTR SettingName, PCSTR SettingValue); - - -#endif // defined __PARSEINI_H diff --git a/reactos/boot/freeldr/freeldr/include/keycodes.h b/reactos/boot/freeldr/freeldr/include/keycodes.h index 55e03edbc8a..5d781f92389 100644 --- a/reactos/boot/freeldr/freeldr/include/keycodes.h +++ b/reactos/boot/freeldr/freeldr/include/keycodes.h @@ -17,9 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __KEYCODES_H -#define __KEYCODES_H - +#pragma once // Key codes #define KEY_EXTENDED 0x00 @@ -41,6 +39,3 @@ #define KEY_F8 0x42 #define KEY_F9 0x43 #define KEY_F10 0x44 - - -#endif // #defined __KEYCODES_H diff --git a/reactos/boot/freeldr/freeldr/include/machine.h b/reactos/boot/freeldr/freeldr/include/machine.h index 440755de6a7..0c0076f4760 100644 --- a/reactos/boot/freeldr/freeldr/include/machine.h +++ b/reactos/boot/freeldr/freeldr/include/machine.h @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __MACHINE_H_ -#define __MACHINE_H_ +#pragma once #ifndef __DISK_H #include "disk.h" @@ -126,6 +125,4 @@ VOID MachPrepareForReactOS(IN BOOLEAN Setup); #define MachDiskGetCacheableBlockCount(Drive) MachVtbl.DiskGetCacheableBlockCount(Drive) #define MachHwDetect() MachVtbl.HwDetect() -#endif /* __MACHINE_H_ */ - /* EOF */ diff --git a/reactos/boot/freeldr/freeldr/include/mm.h b/reactos/boot/freeldr/freeldr/include/mm.h index cfec1478eaa..36a47e0079f 100644 --- a/reactos/boot/freeldr/freeldr/include/mm.h +++ b/reactos/boot/freeldr/freeldr/include/mm.h @@ -17,9 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -#ifndef __MEMORY_H -#define __MEMORY_H +#pragma once typedef enum { @@ -118,5 +116,3 @@ PVOID MmAllocateHighestMemoryBelowAddress(ULONG MemorySize, PVOID DesiredAddress PVOID MmHeapAlloc(ULONG MemorySize); VOID MmHeapFree(PVOID MemoryPointer); - -#endif // defined __MEMORY_H diff --git a/reactos/boot/freeldr/freeldr/include/multiboot.h b/reactos/boot/freeldr/freeldr/include/multiboot.h index be28f2b246c..dd3467f28d2 100644 --- a/reactos/boot/freeldr/freeldr/include/multiboot.h +++ b/reactos/boot/freeldr/freeldr/include/multiboot.h @@ -16,8 +16,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __MULTIBOOT_H -#define __MULTIBOOT_H +#pragma once /* Macros. */ @@ -103,6 +102,3 @@ typedef struct memory_map } memory_map_t; #endif /* ! ASM */ - - -#endif // defined __MULTIBOOT_H diff --git a/reactos/boot/freeldr/freeldr/include/of.h b/reactos/boot/freeldr/freeldr/include/of.h index 8ab77b293b5..76c9d2162ce 100644 --- a/reactos/boot/freeldr/freeldr/include/of.h +++ b/reactos/boot/freeldr/freeldr/include/of.h @@ -1,5 +1,4 @@ -#ifndef FREELDR_OF_H -#define FREELDR_OF_H +#pragma once #define OF_FAILED 0 #define ERR_NOT_FOUND 0xc0000010 @@ -15,5 +14,3 @@ extern of_proxy ofproxy; int setjmp( jmp_buf buf ); int longjmp( jmp_buf buf, int retval ); int ofw_callmethod_ret(const char *method, int handle, int nargs, int *args, int ret); - -#endif/*FREELDR_OF_H*/ diff --git a/reactos/boot/freeldr/freeldr/include/options.h b/reactos/boot/freeldr/freeldr/include/options.h index bfa64798cd3..124b64e2326 100644 --- a/reactos/boot/freeldr/freeldr/include/options.h +++ b/reactos/boot/freeldr/freeldr/include/options.h @@ -17,9 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __OPTIONS_H -#define __OPTIONS_H +#pragma once VOID DoOptionsMenu(VOID); - -#endif // #defined __OPTIONS_H diff --git a/reactos/boot/freeldr/freeldr/include/oslist.h b/reactos/boot/freeldr/freeldr/include/oslist.h index 0f3ab77faef..04df0fa789b 100644 --- a/reactos/boot/freeldr/freeldr/include/oslist.h +++ b/reactos/boot/freeldr/freeldr/include/oslist.h @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __OSLIST_H -#define __OSLIST_H +#pragma once typedef struct tagOperatingSystemItem { @@ -28,5 +27,3 @@ typedef struct tagOperatingSystemItem } OperatingSystemItem; OperatingSystemItem* InitOperatingSystemList(ULONG* OperatingSystemCountPointer); - -#endif // #defined __OSLIST_H diff --git a/reactos/boot/freeldr/freeldr/include/ramdisk.h b/reactos/boot/freeldr/freeldr/include/ramdisk.h index c77c09e6876..8979bcf98a8 100644 --- a/reactos/boot/freeldr/freeldr/include/ramdisk.h +++ b/reactos/boot/freeldr/freeldr/include/ramdisk.h @@ -6,8 +6,7 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -#ifndef _RAMDISK_ -#define _RAMDISK_ +#pragma once // // Ramdisk Routines @@ -26,5 +25,3 @@ RamDiskInitialize( extern PVOID gRamDiskBase; extern ULONG gRamDiskSize; - -#endif diff --git a/reactos/boot/freeldr/freeldr/include/reactos.h b/reactos/boot/freeldr/freeldr/include/reactos.h index de159735d35..0bc48f2cc15 100644 --- a/reactos/boot/freeldr/freeldr/include/reactos.h +++ b/reactos/boot/freeldr/freeldr/include/reactos.h @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __REACTOS_H -#define __REACTOS_H +#pragma once /* Base Addres of Kernel in Physical Memory */ #define KERNEL_BASE_PHYS 0x800000 @@ -128,5 +127,3 @@ FrLdrLoadImage( IN INT nPos, IN ULONG ImageType ); - -#endif // defined __REACTOS_H diff --git a/reactos/boot/freeldr/freeldr/include/rtl.h b/reactos/boot/freeldr/freeldr/include/rtl.h index 877f217a352..d4ef384e9d0 100644 --- a/reactos/boot/freeldr/freeldr/include/rtl.h +++ b/reactos/boot/freeldr/freeldr/include/rtl.h @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __STDLIB_H -#define __STDLIB_H +#pragma once #include @@ -28,5 +27,3 @@ char * convert_i64_to_ascii(char *buf, int c, unsigned long long num); void PcBeep(void); void delay(unsigned msec); void sound(int freq); - -#endif // defined __STDLIB_H diff --git a/reactos/boot/freeldr/freeldr/include/ui.h b/reactos/boot/freeldr/freeldr/include/ui.h index ee58003b0d4..1b57fd9e069 100644 --- a/reactos/boot/freeldr/freeldr/include/ui.h +++ b/reactos/boot/freeldr/freeldr/include/ui.h @@ -17,9 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __UI_H -#define __UI_H - +#pragma once extern ULONG UiScreenWidth; // Screen Width extern ULONG UiScreenHeight; // Screen Height @@ -176,5 +174,3 @@ extern UIVTBL UiVtbl; #define D_HORZ (0xcd) /* Double horizontal line.*/ #define VERT (0xb3) /* Single vertical line */ #define D_VERT (0xba) /* Double vertical line. */ - -#endif // #defined __UI_H diff --git a/reactos/boot/freeldr/freeldr/include/ui/gui.h b/reactos/boot/freeldr/freeldr/include/ui/gui.h index 076fa05aacb..77a983a5eb9 100644 --- a/reactos/boot/freeldr/freeldr/include/ui/gui.h +++ b/reactos/boot/freeldr/freeldr/include/ui/gui.h @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __GUI_H -#define __GUI_H +#pragma once #define TUI_SCREEN_MEM 0xB8000 #define TITLE_BOX_CHAR_HEIGHT 5 @@ -52,5 +51,3 @@ UCHAR GuiTextToFillStyle(PCSTR FillStyleText); // Converts the text fill into BOOLEAN GuiDisplayMenu(PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem); extern const UIVTBL GuiVtbl; - -#endif // #defined __GUI_H diff --git a/reactos/boot/freeldr/freeldr/include/ui/minitui.h b/reactos/boot/freeldr/freeldr/include/ui/minitui.h index d20230b25d4..d845c5202ed 100644 --- a/reactos/boot/freeldr/freeldr/include/ui/minitui.h +++ b/reactos/boot/freeldr/freeldr/include/ui/minitui.h @@ -6,8 +6,7 @@ * PROGRAMMERS: Hervé Poussineau */ -#ifndef __MINITUI_H -#define __MINITUI_H +#pragma once /////////////////////////////////////////////////////////////////////////////////////// // @@ -29,5 +28,3 @@ VOID MiniTuiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UL VOID MiniTuiDrawMenu(PUI_MENU_INFO MenuInfo); extern const UIVTBL MiniTuiVtbl; - -#endif // #defined __TUI_H diff --git a/reactos/boot/freeldr/freeldr/include/ui/noui.h b/reactos/boot/freeldr/freeldr/include/ui/noui.h index df53ce1bdfd..de027d7951b 100644 --- a/reactos/boot/freeldr/freeldr/include/ui/noui.h +++ b/reactos/boot/freeldr/freeldr/include/ui/noui.h @@ -6,8 +6,7 @@ * PROGRAMMERS: Hervé Poussineau */ -#ifndef _NOUI_H_ -#define _NOUI_H_ +#pragma once /////////////////////////////////////////////////////////////////////////////////////// // @@ -47,5 +46,3 @@ VOID NoUiDrawMenu(PUI_MENU_INFO MenuInfo); BOOLEAN NoUiDisplayMenu(PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); VOID NoUiDrawMenu(PUI_MENU_INFO MenuInfo); - -#endif /* _NOUI_H_ */ diff --git a/reactos/boot/freeldr/freeldr/include/ui/tui.h b/reactos/boot/freeldr/freeldr/include/ui/tui.h index 5c0c0c34c0a..ad7faa4cf8e 100644 --- a/reactos/boot/freeldr/freeldr/include/ui/tui.h +++ b/reactos/boot/freeldr/freeldr/include/ui/tui.h @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TUI_H -#define __TUI_H +#pragma once #define TUI_SCREEN_MEM 0xB8000 #define TUI_TITLE_BOX_CHAR_HEIGHT 5 @@ -80,12 +79,6 @@ VOID NTAPI TuiDrawMenuItem(PUI_MENU_INFO MenuInfo, ULONG MenuItemNumber); ULONG NTAPI TuiProcessMenuKeyboardEvent(PUI_MENU_INFO MenuInfo, UiMenuKeyPressFilterCallback KeyPressFilter); BOOLEAN TuiDisplayMenu(PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); - - - - - - /* Definitions for corners, depending on HORIZ and VERT */ #define UL (0xda) #define UR (0xbf) /* HORZ and VERT */ @@ -108,5 +101,3 @@ BOOLEAN TuiDisplayMenu(PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultM #define VD_LR (0xbd) extern const UIVTBL TuiVtbl; - -#endif // #defined __TUI_H diff --git a/reactos/boot/freeldr/freeldr/include/ver.h b/reactos/boot/freeldr/freeldr/include/ver.h index 2f94f80a1a5..d078f8e1416 100644 --- a/reactos/boot/freeldr/freeldr/include/ver.h +++ b/reactos/boot/freeldr/freeldr/include/ver.h @@ -17,9 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __VERSION_H -#define __VERSION_H - +#pragma once /* just some stuff */ #define VERSION "FreeLoader v3.0" @@ -44,6 +42,3 @@ PCHAR GetFreeLoaderVersionString(VOID); #endif // ASM - - -#endif // defined __VERSION_H diff --git a/reactos/boot/freeldr/freeldr/include/video.h b/reactos/boot/freeldr/freeldr/include/video.h index 60d338a10ac..921f28dd521 100644 --- a/reactos/boot/freeldr/freeldr/include/video.h +++ b/reactos/boot/freeldr/freeldr/include/video.h @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __VIDEO_H -#define __VIDEO_H +#pragma once #include typedef struct @@ -43,6 +42,3 @@ VOID VideoRestorePaletteState(PPALETTE_ENTRY Palette, ULONG ColorCount); VOID VideoSetAllColorsToBlack(ULONG ColorCount); VOID VideoFadeIn(PPALETTE_ENTRY Palette, ULONG ColorCount); VOID VideoFadeOut(ULONG ColorCount); - - -#endif // defined __VIDEO_H diff --git a/reactos/boot/freeldr/freeldr/include/winldr.h b/reactos/boot/freeldr/freeldr/include/winldr.h index 8fc5ef8ee3d..ac42a407922 100644 --- a/reactos/boot/freeldr/freeldr/include/winldr.h +++ b/reactos/boot/freeldr/freeldr/include/winldr.h @@ -18,9 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __WINLDR_H -#define __WINLDR_H - +#pragma once /////////////////////////////////////////////////////////////////////////////////////// // @@ -108,6 +106,3 @@ typedef struct /* Root System Descriptor Pointer */ CHAR reserved [3]; /* reserved field must be 0 */ } RSDP_DESCRIPTOR, *PRSDP_DESCRIPTOR; #include - - -#endif // defined __WINLDR_H diff --git a/reactos/boot/freeldr/install/install.h b/reactos/boot/freeldr/install/install.h index beace9228b7..a2c5eff0fb9 100644 --- a/reactos/boot/freeldr/install/install.h +++ b/reactos/boot/freeldr/install/install.h @@ -18,7 +18,4 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __INSTALL_H -#define __INSTALL_H - -#endif // defined __INSTALL_H +#pragma once diff --git a/reactos/boot/freeldr/install/linux/finstext2.h b/reactos/boot/freeldr/install/linux/finstext2.h index b4aa6ae9118..12b3ee80a93 100644 --- a/reactos/boot/freeldr/install/linux/finstext2.h +++ b/reactos/boot/freeldr/install/linux/finstext2.h @@ -1,6 +1,4 @@ -#ifndef __FINSTEXT2_H -#define __FINSTEXT2_H - +#pragma once #define PACKED __attribute__((packed)) @@ -28,8 +26,4 @@ typedef struct unsigned char BootPartition; unsigned short BootSignature; -} PACKED EXT2_BOOTCODE, *PEXT2_BOOTCODE; - - - -#endif // defined __FINSTEXT2_H \ No newline at end of file +} PACKED EXT2_BOOTCODE, *PEXT2_BOOTCODE; \ No newline at end of file diff --git a/reactos/boot/freeldr/install/volume.h b/reactos/boot/freeldr/install/volume.h index f173a6a455c..26654fc3009 100644 --- a/reactos/boot/freeldr/install/volume.h +++ b/reactos/boot/freeldr/install/volume.h @@ -18,12 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __VOLUME_H -#define __VOLUME_H +#pragma once BOOL OpenVolume(LPCTSTR lpszVolumeName); void CloseVolume(void); BOOL ReadVolumeSector(ULONG SectorNumber, PVOID SectorBuffer); BOOL WriteVolumeSector(ULONG SectorNumber, PVOID SectorBuffer); - -#endif // defined __VOLUME_H diff --git a/reactos/dll/cpl/access/access.h b/reactos/dll/cpl/access/access.h index 954b0940f68..88c29d2c8c7 100644 --- a/reactos/dll/cpl/access/access.h +++ b/reactos/dll/cpl/access/access.h @@ -1,5 +1,4 @@ -#ifndef __CPL_SYSDM_H -#define __CPL_SYSDM_H +#pragma once typedef LONG (CALLBACK *APPLET_INITPROC)(VOID); @@ -59,6 +58,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); -#endif /* __CPL_SYSDM_H */ - /* EOF */ diff --git a/reactos/dll/cpl/access/resource.h b/reactos/dll/cpl/access/resource.h index 88f6ffa889e..04ab1183ddf 100644 --- a/reactos/dll/cpl/access/resource.h +++ b/reactos/dll/cpl/access/resource.h @@ -1,5 +1,4 @@ -#ifndef __CPL_RESOURCE_H -#define __CPL_RESOURCE_H +#pragma once /* metrics */ #define PROPSHEETWIDTH 246 @@ -113,6 +112,4 @@ #define IDC_SERIAL_PORT_COMBO 275 #define IDC_SERIAL_BAUD_COMBO 276 -#endif /* __CPL_RESOURCE_H */ - /* EOF */ diff --git a/reactos/dll/cpl/appwiz/appwiz.h b/reactos/dll/cpl/appwiz/appwiz.h index c243997817a..8ee2bd4c6b3 100644 --- a/reactos/dll/cpl/appwiz/appwiz.h +++ b/reactos/dll/cpl/appwiz/appwiz.h @@ -1,5 +1,4 @@ -#ifndef __CPL_APPWIZ_H -#define __CPL_APPWIZ_H +#pragma once #define COBJMACROS #include @@ -41,6 +40,4 @@ NewLinkHere(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2); void ShowLastWin32Error(HWND hWndOwner); -#endif /* __CPL_APPWIZ_H */ - /* EOF */ diff --git a/reactos/dll/cpl/appwiz/resource.h b/reactos/dll/cpl/appwiz/resource.h index e889fafe2f6..b0dda4080cf 100644 --- a/reactos/dll/cpl/appwiz/resource.h +++ b/reactos/dll/cpl/appwiz/resource.h @@ -1,5 +1,4 @@ -#ifndef __CPL_RESOURCE_H -#define __CPL_RESOURCE_H +#pragma once /* metrics */ #define PROPSHEETWIDTH 380 @@ -32,6 +31,4 @@ #define IDC_SHORTCUT_BROWSE 108 #define IDC_SHORTCUT_NAME 109 -#endif /* __CPL_RESOURCE_H */ - /* EOF */ diff --git a/reactos/dll/cpl/console/resource.h b/reactos/dll/cpl/console/resource.h index e621cc60ea5..09ffcced27c 100644 --- a/reactos/dll/cpl/console/resource.h +++ b/reactos/dll/cpl/console/resource.h @@ -1,5 +1,4 @@ -#ifndef RESOURCE_H__ -#define RESOURCE_H__ +#pragma once #define IDC_CPLICON 40 #define IDS_CPLNAME 41 @@ -92,5 +91,3 @@ //string ids #define IDS_SCREEN_TEXT 700 #define IDS_RASTERFONTS 701 - -#endif diff --git a/reactos/dll/cpl/desk/desk.h b/reactos/dll/cpl/desk/desk.h index 8b1d9de7d90..a486eadbe65 100644 --- a/reactos/dll/cpl/desk/desk.h +++ b/reactos/dll/cpl/desk/desk.h @@ -1,5 +1,4 @@ -#ifndef __CPL_DESK_H__ -#define __CPL_DESK_H__ +#pragma once #define COBJMACROS #include @@ -96,6 +95,3 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*); INT_PTR CALLBACK AdvGeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - -#endif /* __CPL_DESK_H__ */ - diff --git a/reactos/dll/cpl/desk/monslctl.h b/reactos/dll/cpl/desk/monslctl.h index 28326ea7683..7ee32440ae4 100644 --- a/reactos/dll/cpl/desk/monslctl.h +++ b/reactos/dll/cpl/desk/monslctl.h @@ -1,5 +1,4 @@ -#ifndef __MONSLCTL__H -#define __MONSLCTL__H +#pragma once /* Control extended styles */ #define MSLM_EX_ALLOWSELECTNONE 0x1 @@ -214,5 +213,3 @@ typedef struct _MONSL_MONNMMONITORCHANGING BOOL RegisterMonitorSelectionControl(IN HINSTANCE hInstance); VOID UnregisterMonitorSelectionControl(IN HINSTANCE hInstance); - -#endif /* __MONSLCTL__H */ diff --git a/reactos/dll/cpl/desk/resource.h b/reactos/dll/cpl/desk/resource.h index 54fa074dd39..ae02abac30f 100644 --- a/reactos/dll/cpl/desk/resource.h +++ b/reactos/dll/cpl/desk/resource.h @@ -1,5 +1,4 @@ -#ifndef __CPL_DESK_RESOURCE_H__ -#define __CPL_DESK_RESOURCE_H__ +#pragma once /* metrics */ #define PROPSHEETWIDTH 246 @@ -185,7 +184,3 @@ #define IDC_RESTART_RB 5002 #define IDC_WITHOUTREBOOT_RB 5003 #define IDC_ASKME_RB 5004 - -#endif /* __CPL_DESK_RESOURCE_H__ */ - - diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.h b/reactos/dll/cpl/hdwwiz/hdwwiz.h index b480ad10165..3712adb222a 100644 --- a/reactos/dll/cpl/hdwwiz/hdwwiz.h +++ b/reactos/dll/cpl/hdwwiz/hdwwiz.h @@ -1,5 +1,4 @@ -#ifndef __CPL_HDWWIZ_H -#define __CPL_HDWWIZ_H +#pragma once #include #include @@ -19,6 +18,4 @@ extern HINSTANCE hApplet; -#endif /* __CPL_HDWWIZ_H */ - /* EOF */ diff --git a/reactos/dll/cpl/hdwwiz/resource.h b/reactos/dll/cpl/hdwwiz/resource.h index 98f8a9c6c75..1d5a832bf89 100644 --- a/reactos/dll/cpl/hdwwiz/resource.h +++ b/reactos/dll/cpl/hdwwiz/resource.h @@ -1,5 +1,4 @@ -#ifndef __CPL_RESOURCE_H -#define __CPL_RESOURCE_H +#pragma once /* Icons */ #define IDI_CPLICON 100 @@ -57,6 +56,4 @@ #define IDC_NOTCONNECTED 505 #define IDC_TURNOFFCHECKBOX 506 -#endif /* __CPL_RESOURCE_H */ - /* EOF */ diff --git a/reactos/dll/cpl/input/input.h b/reactos/dll/cpl/input/input.h index 3e2ca9fe3e4..edfe121878f 100644 --- a/reactos/dll/cpl/input/input.h +++ b/reactos/dll/cpl/input/input.h @@ -1,5 +1,4 @@ -#ifndef __CPL_INPUT_H -#define __CPL_INPUT_H +#pragma once #include #include @@ -66,6 +65,4 @@ GetHotkeys(LPTSTR szHotkey, LPTSTR szLangHotkey, LPTSTR szLayoutHotkey); void ShowLastWin32Error(HWND hWndOwner); -#endif /* __CPL_INPUT_H */ - /* EOF */ diff --git a/reactos/dll/cpl/input/resource.h b/reactos/dll/cpl/input/resource.h index 9d6408a3d39..4147d2c3da5 100644 --- a/reactos/dll/cpl/input/resource.h +++ b/reactos/dll/cpl/input/resource.h @@ -1,5 +1,4 @@ -#ifndef __CPL_RESOURCE_H -#define __CPL_RESOURCE_H +#pragma once /* metrics */ #define PROPSHEETWIDTH 252 @@ -204,6 +203,4 @@ #define IDS_BURMESE_LAYOUT 5140 #define IDS_UKRAINIAN_STUDENT_LAYOUT 5141 -#endif /* __CPL_RESOURCE_H */ - /* EOF */ diff --git a/reactos/dll/cpl/intl/intl.h b/reactos/dll/cpl/intl/intl.h index 9e58f77a90a..12de475dc5e 100644 --- a/reactos/dll/cpl/intl/intl.h +++ b/reactos/dll/cpl/intl/intl.h @@ -1,5 +1,4 @@ -#ifndef __CPL_INTL_H -#define __CPL_INTL_H +#pragma once #include @@ -103,6 +102,4 @@ SetupApplet(HWND hwndDlg, LCID lcid); /* kblayouts.c */ VOID AddNewKbLayoutsByLcid(LCID Lcid); -#endif /* __CPL_INTL_H */ - /* EOF */ diff --git a/reactos/dll/cpl/intl/resource.h b/reactos/dll/cpl/intl/resource.h index de4582ec932..8491517acce 100644 --- a/reactos/dll/cpl/intl/resource.h +++ b/reactos/dll/cpl/intl/resource.h @@ -1,5 +1,4 @@ -#ifndef __CPL_RESOURCE_H -#define __CPL_RESOURCE_H +#pragma once #define IDC_FLAGS 2 @@ -76,6 +75,4 @@ #define IDS_CUSTOMIZE_TITLE 1002 #define IDS_SPAIN 1003 -#endif /* __CPL_RESOURCE_H */ - /* EOF */ diff --git a/reactos/dll/cpl/joy/joy.h b/reactos/dll/cpl/joy/joy.h index 4aacd59df6d..7e1b30c2916 100644 --- a/reactos/dll/cpl/joy/joy.h +++ b/reactos/dll/cpl/joy/joy.h @@ -1,5 +1,4 @@ -#ifndef __CPL_JOY_H -#define __CPL_JOY_H +#pragma once #include #include @@ -35,6 +34,4 @@ extern HINSTANCE hApplet; void ShowLastWin32Error(HWND hWndOwner); -#endif /* __CPL_JOY_H */ - /* EOF */ diff --git a/reactos/dll/cpl/joy/resource.h b/reactos/dll/cpl/joy/resource.h index a2083da057f..17efe670339 100644 --- a/reactos/dll/cpl/joy/resource.h +++ b/reactos/dll/cpl/joy/resource.h @@ -1,5 +1,4 @@ -#ifndef __CPL_RESOURCE_H -#define __CPL_RESOURCE_H +#pragma once /* icons */ #define IDI_CPLSYSTEM 102 @@ -39,6 +38,4 @@ #define IDC_CONTROLLER_NAME_EDIT 1056 #define IDC_PREFERRED_DEV_COMBO 8195 -#endif /* __CPL_RESOURCE_H */ - /* EOF */ diff --git a/reactos/dll/cpl/liccpa/liccpa.h b/reactos/dll/cpl/liccpa/liccpa.h index 817bd4fc80a..694663d2082 100644 --- a/reactos/dll/cpl/liccpa/liccpa.h +++ b/reactos/dll/cpl/liccpa/liccpa.h @@ -1,5 +1,4 @@ -#ifndef __CPL_SAMPLE_H -#define __CPL_SAMPLE_H +#pragma once typedef struct { @@ -11,6 +10,4 @@ typedef struct extern HINSTANCE hApplet; -#endif /* __CPL_SAMPLE_H */ - /* EOF */ diff --git a/reactos/dll/cpl/liccpa/resource.h b/reactos/dll/cpl/liccpa/resource.h index 917dc15c69f..b1cbbf74c6a 100644 --- a/reactos/dll/cpl/liccpa/resource.h +++ b/reactos/dll/cpl/liccpa/resource.h @@ -1,5 +1,4 @@ -#ifndef __CPL_RESOURCE_H -#define __CPL_RESOURCE_H +#pragma once /* ids */ @@ -13,6 +12,4 @@ #define IDC_OK 107 #define IDC_CANCEL 108 -#endif /* __CPL_RESOURCE_H */ - /* EOF */ diff --git a/reactos/dll/cpl/main/main.h b/reactos/dll/cpl/main/main.h index 18d713c2c69..2c32c7e63b1 100644 --- a/reactos/dll/cpl/main/main.h +++ b/reactos/dll/cpl/main/main.h @@ -1,5 +1,4 @@ -#ifndef __CPL_MAIN_H -#define __CPL_MAIN_H +#pragma once typedef enum { @@ -46,6 +45,4 @@ PropSheetAddPage(HPROPSHEETPAGE hpage, LPARAM lParam); LONG APIENTRY MouseApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); -#endif /* __CPL_MAIN_H */ - /* EOF */ diff --git a/reactos/dll/cpl/main/resource.h b/reactos/dll/cpl/main/resource.h index cc4d770defe..169c2ea67fe 100644 --- a/reactos/dll/cpl/main/resource.h +++ b/reactos/dll/cpl/main/resource.h @@ -1,5 +1,4 @@ -#ifndef __CPL_RESOURCE_H -#define __CPL_RESOURCE_H +#pragma once /* Icons */ #define IDC_CPLICON_1 100 @@ -102,6 +101,4 @@ #define IDC_TEXT_TRAIL_SHORT 2057 #define IDC_TEXT_TRAIL_LONG 2058 -#endif /* __CPL_RESOURCE_H */ - /* EOF */ diff --git a/reactos/dll/cpl/mmsys/mmsys.h b/reactos/dll/cpl/mmsys/mmsys.h index 87d313f4b8d..ed6c480a0c0 100644 --- a/reactos/dll/cpl/mmsys/mmsys.h +++ b/reactos/dll/cpl/mmsys/mmsys.h @@ -1,5 +1,4 @@ -#ifndef __CPL_MMSYS_H -#define __CPL_MMSYS_H +#pragma once //typedef LONG (CALLBACK *APPLET_PROC)(VOID); @@ -64,6 +63,4 @@ AudioDlgProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam); -#endif /* __CPL_MMSYS_H */ - /* EOF */ diff --git a/reactos/dll/cpl/mmsys/resource.h b/reactos/dll/cpl/mmsys/resource.h index c8511da90c0..6423de9fe37 100644 --- a/reactos/dll/cpl/mmsys/resource.h +++ b/reactos/dll/cpl/mmsys/resource.h @@ -1,5 +1,4 @@ -#ifndef __CPL_RESOURCE_H -#define __CPL_RESOURCE_H +#pragma once /* Icons */ #define IDI_CPLICON 3004 @@ -77,6 +76,4 @@ #define IDS_NO_SOUND 1002 #define IDS_NO_DEVICES 1003 -#endif /* __CPL_RESOURCE_H */ - /* EOF */ diff --git a/reactos/dll/cpl/odbccp32/odbccp32.h b/reactos/dll/cpl/odbccp32/odbccp32.h index e1e7e3324e1..8a534c4b038 100644 --- a/reactos/dll/cpl/odbccp32/odbccp32.h +++ b/reactos/dll/cpl/odbccp32/odbccp32.h @@ -1,5 +1,4 @@ -#ifndef ODBCCP32_H__ // odbccp32.h -#define ODBCCP32_H__ +#pragma once #include #include @@ -8,5 +7,3 @@ extern HINSTANCE hApplet; extern HMODULE hLibrary; - -#endif /* end of ODBCCP32_H__ */ diff --git a/reactos/dll/cpl/powercfg/powercfg.h b/reactos/dll/cpl/powercfg/powercfg.h index 1a0fc7d24c1..27b54e596a8 100644 --- a/reactos/dll/cpl/powercfg/powercfg.h +++ b/reactos/dll/cpl/powercfg/powercfg.h @@ -1,5 +1,4 @@ -#ifndef POWERCFG_H -#define POWERCFG_H +#pragma once #include "powrprof.h" @@ -23,6 +22,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); -#endif /* __CPL_SAMPLE_H */ - /* EOF */ diff --git a/reactos/dll/cpl/powercfg/resource.h b/reactos/dll/cpl/powercfg/resource.h index e98c6023231..5993106ecfb 100644 --- a/reactos/dll/cpl/powercfg/resource.h +++ b/reactos/dll/cpl/powercfg/resource.h @@ -1,5 +1,4 @@ -#ifndef __CPL_RESOURCE_H -#define __CPL_RESOURCE_H +#pragma once /* metrics */ #define PROPSHEETWIDTH 246 @@ -124,6 +123,4 @@ #define IDS_CPLDESCRIPTION_1 901 -#endif /* __CPL_RESOURCE_H */ - /* EOF */ diff --git a/reactos/dll/cpl/sysdm/resource.h b/reactos/dll/cpl/sysdm/resource.h index b111e5c3171..f0918a35d9f 100644 --- a/reactos/dll/cpl/sysdm/resource.h +++ b/reactos/dll/cpl/sysdm/resource.h @@ -1,5 +1,4 @@ -#ifndef __CPL_RESOURCE_H -#define __CPL_RESOURCE_H +#pragma once #define IDC_STATIC -1 @@ -157,5 +156,3 @@ #define RTDATA 1503 #define IDS_DEVS 2000 - -#endif /* __CPL_RESOURCE_H */ diff --git a/reactos/dll/cpl/telephon/resource.h b/reactos/dll/cpl/telephon/resource.h index a4be13c91aa..9d2319a8bb0 100644 --- a/reactos/dll/cpl/telephon/resource.h +++ b/reactos/dll/cpl/telephon/resource.h @@ -1,5 +1,4 @@ -#ifndef __CPL_RESOURCE_H -#define __CPL_RESOURCE_H +#pragma once /* icons */ #define IDI_CPLSYSTEM 100 @@ -8,6 +7,4 @@ #define IDS_CPLSYSTEMNAME 1001 #define IDS_CPLSYSTEMDESCRIPTION 2001 -#endif /* __CPL_RESOURCE_H */ - /* EOF */ diff --git a/reactos/dll/cpl/timedate/resource.h b/reactos/dll/cpl/timedate/resource.h index 501500a14de..b420c359703 100644 --- a/reactos/dll/cpl/timedate/resource.h +++ b/reactos/dll/cpl/timedate/resource.h @@ -1,6 +1,4 @@ -#ifndef __CPL_RESOURCE_H -#define __CPL_RESOURCE_H - +#pragma once #define IDC_CPLICON 1 @@ -38,5 +36,3 @@ #define IDS_INETTIMENEXTSYNC 1007 #define IDS_INETTIMESYNCING 1008 #define IDS_INETTIMEERROR 1009 - -#endif /* __CPL_RESOURCE_H */ diff --git a/reactos/dll/cpl/timedate/timedate.h b/reactos/dll/cpl/timedate/timedate.h index 54915563b90..ced96a12eec 100644 --- a/reactos/dll/cpl/timedate/timedate.h +++ b/reactos/dll/cpl/timedate/timedate.h @@ -1,5 +1,4 @@ -#ifndef __CPL_SAMPLE_H -#define __CPL_SAMPLE_H +#pragma once #include #include @@ -112,6 +111,4 @@ typedef struct _NMMCCAUTOUPDATE BOOL RegisterMonthCalControl(IN HINSTANCE hInstance); VOID UnregisterMonthCalControl(IN HINSTANCE hInstance); -#endif /* __CPL_SAMPLE_H */ - /* EOF */ diff --git a/reactos/dll/cpl/usrmgr/resource.h b/reactos/dll/cpl/usrmgr/resource.h index 34910d48007..c0c7bfa97fb 100644 --- a/reactos/dll/cpl/usrmgr/resource.h +++ b/reactos/dll/cpl/usrmgr/resource.h @@ -1,5 +1,4 @@ -#ifndef __CPL_USRMGR_RESOURCE_H__ -#define __CPL_USRMGR_RESOURCE_H__ +#pragma once #include @@ -115,6 +114,3 @@ #define IDM_USER_DELETE 133 #define IDM_USER_RENAME 134 #define IDM_USER_PROPERTIES 135 - -#endif /* __CPL_USRMGR_RESOURCE_H__ */ - diff --git a/reactos/dll/cpl/usrmgr/usrmgr.h b/reactos/dll/cpl/usrmgr/usrmgr.h index 9820606c3f5..13896cd147c 100644 --- a/reactos/dll/cpl/usrmgr/usrmgr.h +++ b/reactos/dll/cpl/usrmgr/usrmgr.h @@ -1,5 +1,4 @@ -#ifndef __CPL_DESK_H__ -#define __CPL_DESK_H__ +#pragma once #include #include @@ -45,6 +44,3 @@ CheckAccountName(HWND hwndDlg, /* userprops.c */ BOOL UserProperties(HWND hwndDlg); - -#endif /* __CPL_DESK_H__ */ - diff --git a/reactos/dll/directx/ddraw/rosdraw.h b/reactos/dll/directx/ddraw/rosdraw.h index f38172e1f84..6cb0f2088c8 100644 --- a/reactos/dll/directx/ddraw/rosdraw.h +++ b/reactos/dll/directx/ddraw/rosdraw.h @@ -1,5 +1,4 @@ -#ifndef __DDRAW_PRIVATE -#define __DDRAW_PRIVATE +#pragma once /********* Includes *********/ #include @@ -283,5 +282,3 @@ VOID Hal_DirectDraw_Release (LPDIRECTDRAW7); #define DX_STUB_str(x) // #endif - -#endif /* __DDRAW_PRIVATE */ diff --git a/reactos/dll/directx/dsound_new/precomp.h b/reactos/dll/directx/dsound_new/precomp.h index 4d413df51b9..71c314c40d8 100644 --- a/reactos/dll/directx/dsound_new/precomp.h +++ b/reactos/dll/directx/dsound_new/precomp.h @@ -1,5 +1,4 @@ -#ifndef PRECOMP_H__ -#define PRECOMP_H__ +#pragma once #define COBJMACROS #define NONAMELESSUNION @@ -267,5 +266,3 @@ NewDirectSoundNotify( BOOL bMix, HANDLE hPin, DWORD BufferSize); - -#endif diff --git a/reactos/dll/directx/dsound_new/resource.h b/reactos/dll/directx/dsound_new/resource.h index 5c963cca5f6..04f9ebf3df7 100644 --- a/reactos/dll/directx/dsound_new/resource.h +++ b/reactos/dll/directx/dsound_new/resource.h @@ -1,16 +1,4 @@ -#ifndef RESOURCE_H__ -#define RESOURCE_H__ +#pragma once #define IDS_PRIMARY_PLAYBACK_DEVICE 100 #define IDS_PRIMARY_RECORD_DEVICE 101 - - - - - - - - - - -#endif diff --git a/reactos/dll/directx/ksproxy/precomp.h b/reactos/dll/directx/ksproxy/precomp.h index f0e2a8d083e..cf72d8c8195 100644 --- a/reactos/dll/directx/ksproxy/precomp.h +++ b/reactos/dll/directx/ksproxy/precomp.h @@ -1,5 +1,4 @@ -#ifndef PRECOMP_H_ -#define PRECOMP_H_ +#pragma once #define BUILDING_KS #define _KSDDK_ @@ -97,5 +96,3 @@ CKsProxy_Constructor( IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); - -#endif diff --git a/reactos/dll/directx/ksuser/ksuser.h b/reactos/dll/directx/ksuser/ksuser.h index 1d60b17c611..de44aab6d8b 100644 --- a/reactos/dll/directx/ksuser/ksuser.h +++ b/reactos/dll/directx/ksuser/ksuser.h @@ -1,5 +1,4 @@ -#ifndef KSUSER_H__ -#define KSUSER_H__ +#pragma once #define _KSDDK_ @@ -15,5 +14,3 @@ #define ROUND_UP(n, align) \ ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) - -#endif diff --git a/reactos/dll/shellext/deskadp/deskadp.h b/reactos/dll/shellext/deskadp/deskadp.h index 2de98b3b697..11ab46a2318 100644 --- a/reactos/dll/shellext/deskadp/deskadp.h +++ b/reactos/dll/shellext/deskadp/deskadp.h @@ -1,5 +1,4 @@ -#ifndef __DESKADP__H -#define __DESKADP__H +#pragma once typedef struct _DESKDISPLAYADAPTER { @@ -59,5 +58,3 @@ IDeskDisplayAdapter_ReplacePage(PDESKDISPLAYADAPTER This, static const GUID CLSID_IDeskDisplayAdapter = {0x42071712,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf3}}; ULONG __cdecl DbgPrint(PCCH Format,...); - -#endif /* __DESKADP__H */ diff --git a/reactos/dll/shellext/deskadp/resource.h b/reactos/dll/shellext/deskadp/resource.h index 6268f48e3be..ab3d1fae66b 100644 --- a/reactos/dll/shellext/deskadp/resource.h +++ b/reactos/dll/shellext/deskadp/resource.h @@ -1,5 +1,4 @@ -#ifndef __RESOURCE__H -#define __RESOURCE__H +#pragma once #define IDD_DISPLAYADAPTER 100 #define IDD_LISTALLMODES 101 @@ -24,5 +23,3 @@ #define IDS_16BPP 107 #define IDS_24BPP 108 #define IDS_32BPP 109 - -#endif /* __RESOURCE__H */ diff --git a/reactos/dll/shellext/deskmon/deskmon.h b/reactos/dll/shellext/deskmon/deskmon.h index 36157005d9d..d2d381a7561 100644 --- a/reactos/dll/shellext/deskmon/deskmon.h +++ b/reactos/dll/shellext/deskmon/deskmon.h @@ -1,5 +1,4 @@ -#ifndef __DESKMON__H -#define __DESKMON__H +#pragma once typedef struct _DESKMONINFO { @@ -79,5 +78,3 @@ IDeskMonitor_ReplacePage(PDESKMONITOR This, static const GUID CLSID_IDeskMonitor = {0x42071713,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf3}}; ULONG __cdecl DbgPrint(PCCH Format,...); - -#endif /* __DESKMON__H */ diff --git a/reactos/dll/shellext/deskmon/resource.h b/reactos/dll/shellext/deskmon/resource.h index 17c564a42a2..dd3573bdb12 100644 --- a/reactos/dll/shellext/deskmon/resource.h +++ b/reactos/dll/shellext/deskmon/resource.h @@ -1,5 +1,4 @@ -#ifndef __RESOURCE__H -#define __RESOURCE__H +#pragma once #define IDD_MONITOR 100 @@ -13,5 +12,3 @@ #define IDS_USEDEFFRQUENCY 101 #define IDS_FREQFMT 102 - -#endif /* __RESOURCE__H */ diff --git a/reactos/dll/shellext/fontext/fontext.h b/reactos/dll/shellext/fontext/fontext.h index 21cd62d8099..c62ce1c49a0 100644 --- a/reactos/dll/shellext/fontext/fontext.h +++ b/reactos/dll/shellext/fontext/fontext.h @@ -1,5 +1,4 @@ -#ifndef __FONTEXT__H -#define __FONTEXT__H +#pragma once #define COBJMACROS #include @@ -8,5 +7,3 @@ #include #include - -#endif /* __FONTEXT__H */ diff --git a/reactos/dll/shellext/fontext/resource.h b/reactos/dll/shellext/fontext/resource.h index 3c2afa78abf..2fdfda08f9c 100644 --- a/reactos/dll/shellext/fontext/resource.h +++ b/reactos/dll/shellext/fontext/resource.h @@ -1,6 +1,3 @@ -#ifndef __RESOURCE__H -#define __RESOURCE__H +#pragma once #define IDS_REACTOS_FONTS_FOLDER 151 - -#endif /* __RESOURCE__H */ diff --git a/reactos/dll/shellext/slayer/resource.h b/reactos/dll/shellext/slayer/resource.h index a0f23b47fc3..f3312163484 100644 --- a/reactos/dll/shellext/slayer/resource.h +++ b/reactos/dll/shellext/slayer/resource.h @@ -1,5 +1,4 @@ -#ifndef __SLAYER_RESOURCE_H -#define __SLAYER_RESOURCE_H +#pragma once #define IDD_SLAYERSHEET 100 #define IDD_EDITCOMPATIBILITYMODES 101 @@ -19,6 +18,4 @@ #define IDS_SLAYER 100 #define IDS_DESCRIPTION 101 -#endif /* __SLAYER_RESOURCE_H */ - /* EOF */ diff --git a/reactos/dll/shellext/slayer/slayer.h b/reactos/dll/shellext/slayer/slayer.h index f48538e430a..6cad312a0bf 100644 --- a/reactos/dll/shellext/slayer/slayer.h +++ b/reactos/dll/shellext/slayer/slayer.h @@ -1,5 +1,4 @@ -#ifndef __SLAYER_H -#define __SLAYER_H +#pragma once extern HINSTANCE hInstance; @@ -120,7 +119,4 @@ HRESULT STDMETHODCALLTYPE ICompatibilityPage_fnCreateInstance(LPCOMPATIBILITYPAG HRESULT STDMETHODCALLTYPE ICompatibilityPage_fnLockServer(LPCOMPATIBILITYPAGE this, BOOL fLock); - -#endif /* __SLAYER_H */ - /* EOF */ diff --git a/reactos/dll/win32/acledit/acleditint.h b/reactos/dll/win32/acledit/acleditint.h index 3b10fa5f4f3..1ebad0b6531 100644 --- a/reactos/dll/win32/acledit/acleditint.h +++ b/reactos/dll/win32/acledit/acleditint.h @@ -1,5 +1,4 @@ -#ifndef __ACLEDITINT_H -#define __ACLEDITINT_H +#pragma once extern HINSTANCE hDllInstance; @@ -55,6 +54,4 @@ typedef DWORD (CALLBACK *PACL_CHANGE)(HWND hWnd, BOOL bApplyToSubObjects, LPDWORD lpdwChangeContextStatus); -#endif /* __ACLEDITINT_H */ - /* EOF */ diff --git a/reactos/dll/win32/acledit/resource.h b/reactos/dll/win32/acledit/resource.h index 89c5d02b7cf..eedab0a3aee 100644 --- a/reactos/dll/win32/acledit/resource.h +++ b/reactos/dll/win32/acledit/resource.h @@ -1,8 +1,5 @@ -#ifndef __DEVMGR_RESOURCE_H -#define __DEVMGR_RESOURCE_H +#pragma once #define IDI_DEVMGR 100 -#endif /* __DEVMGR_RESOURCE_H */ - /* EOF */ diff --git a/reactos/dll/win32/aclui/resource.h b/reactos/dll/win32/aclui/resource.h index 6c2b8664c7c..326b879f52b 100644 --- a/reactos/dll/win32/aclui/resource.h +++ b/reactos/dll/win32/aclui/resource.h @@ -1,5 +1,4 @@ -#ifndef __ACLUI_RESOURCE_H -#define __ACLUI_RESOURCE_H +#pragma once #define IDD_SECPAGE 101 @@ -24,6 +23,4 @@ #define IDB_USRGRPIMAGES 1001 -#endif /* __ACLUI_RESOURCE_H */ - /* EOF */ diff --git a/reactos/dll/win32/browseui/aclmulti.h b/reactos/dll/win32/browseui/aclmulti.h index b29896bc542..1dd4862f734 100644 --- a/reactos/dll/win32/browseui/aclmulti.h +++ b/reactos/dll/win32/browseui/aclmulti.h @@ -19,8 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _aclmulti_h -#define _aclmulti_h +#pragma once class CACLMulti : public CComCoClass, @@ -73,5 +72,3 @@ BEGIN_COM_MAP(CACLMulti) COM_INTERFACE_ENTRY_IID(IID_IObjMgr, IObjMgr) END_COM_MAP() }; - -#endif // _aclmulti_h diff --git a/reactos/dll/win32/browseui/addressband.h b/reactos/dll/win32/browseui/addressband.h index e83ca945e79..0e7c4237e67 100644 --- a/reactos/dll/win32/browseui/addressband.h +++ b/reactos/dll/win32/browseui/addressband.h @@ -18,8 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _addressband_h -#define _addressband_h +#pragma once class CAddressBand : public CWindowImpl, @@ -131,5 +130,3 @@ BEGIN_COM_MAP(CAddressBand) COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) END_COM_MAP() }; - -#endif // _addressband_h diff --git a/reactos/dll/win32/browseui/addresseditbox.h b/reactos/dll/win32/browseui/addresseditbox.h index fdb2057a455..4ddc39e8c66 100644 --- a/reactos/dll/win32/browseui/addresseditbox.h +++ b/reactos/dll/win32/browseui/addresseditbox.h @@ -18,8 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _addresseditbox_h -#define _addresseditbox_h +#pragma once class CAddressEditBox : public CWindowImpl, @@ -108,5 +107,3 @@ BEGIN_COM_MAP(CAddressEditBox) COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) END_COM_MAP() }; - -#endif // _addresseditbox_h diff --git a/reactos/dll/win32/browseui/bandproxy.h b/reactos/dll/win32/browseui/bandproxy.h index 946e10380a7..36810cf2d1f 100644 --- a/reactos/dll/win32/browseui/bandproxy.h +++ b/reactos/dll/win32/browseui/bandproxy.h @@ -18,8 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _bandproxy_h -#define _bandproxy_h +#pragma once class CBandProxy : public CComCoClass, @@ -50,5 +49,3 @@ BEGIN_COM_MAP(CBandProxy) COM_INTERFACE_ENTRY_IID(IID_IBandProxy, IBandProxy) END_COM_MAP() }; - -#endif // _bandproxy_h diff --git a/reactos/dll/win32/browseui/bandsite.h b/reactos/dll/win32/browseui/bandsite.h index 5ea7ae72dff..8b30acb9c2c 100644 --- a/reactos/dll/win32/browseui/bandsite.h +++ b/reactos/dll/win32/browseui/bandsite.h @@ -19,8 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _bandsite_h -#define _bandsite_h +#pragma once class CBandSiteBase : public CComObjectRootEx, @@ -150,5 +149,3 @@ DECLARE_NOT_AGGREGATABLE(CBandSite) DECLARE_PROTECT_FINAL_CONSTRUCT() }; - -#endif // _bandsite_h diff --git a/reactos/dll/win32/browseui/bandsitemenu.h b/reactos/dll/win32/browseui/bandsitemenu.h index 01335f5da69..bf7ae6d24a5 100644 --- a/reactos/dll/win32/browseui/bandsitemenu.h +++ b/reactos/dll/win32/browseui/bandsitemenu.h @@ -19,8 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _bandsitemenu_h -#define _bandsitemenu_h +#pragma once // oddly, this class also responds to QueryInterface for CLSID_BandSiteMenu by returning the vtable at offset 0 class CBandSiteMenu : @@ -56,5 +55,3 @@ BEGIN_COM_MAP(CBandSiteMenu) END_COM_MAP() }; - -#endif // _bandsitemenu_h diff --git a/reactos/dll/win32/browseui/brandband.h b/reactos/dll/win32/browseui/brandband.h index 50ad1d6f231..bfbfdfee5c9 100644 --- a/reactos/dll/win32/browseui/brandband.h +++ b/reactos/dll/win32/browseui/brandband.h @@ -18,8 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _brandband_h -#define _brandband_h +#pragma once class CBrandBand : public CWindowImpl, @@ -128,5 +127,3 @@ BEGIN_COM_MAP(CBrandBand) COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) END_COM_MAP() }; - -#endif // _brandband_h diff --git a/reactos/dll/win32/browseui/commonbrowser.h b/reactos/dll/win32/browseui/commonbrowser.h index dfe5562920a..b6448534cb4 100644 --- a/reactos/dll/win32/browseui/commonbrowser.h +++ b/reactos/dll/win32/browseui/commonbrowser.h @@ -18,8 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _commonbrowser_h -#define _commonbrowser_h +#pragma once class CCommonBrowser : public CComCoClass, @@ -206,5 +205,3 @@ BEGIN_COM_MAP(CCommonBrowser) COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) END_COM_MAP() }; - -#endif // _commonbrowser_h diff --git a/reactos/dll/win32/browseui/globalfoldersettings.h b/reactos/dll/win32/browseui/globalfoldersettings.h index 1878f4017d3..cbd1cd8bc4b 100644 --- a/reactos/dll/win32/browseui/globalfoldersettings.h +++ b/reactos/dll/win32/browseui/globalfoldersettings.h @@ -18,8 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _globalfoldersettings_h -#define _globalfoldersettings_h +#pragma once class CGlobalFolderSettings : public CComCoClass, @@ -44,5 +43,3 @@ BEGIN_COM_MAP(CGlobalFolderSettings) COM_INTERFACE_ENTRY_IID(IID_IGlobalFolderSettings, IGlobalFolderSettings) END_COM_MAP() }; - -#endif // _globalfoldersettings_h diff --git a/reactos/dll/win32/browseui/internettoolbar.h b/reactos/dll/win32/browseui/internettoolbar.h index 28b43830271..650974fd1f4 100644 --- a/reactos/dll/win32/browseui/internettoolbar.h +++ b/reactos/dll/win32/browseui/internettoolbar.h @@ -18,8 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _internettoolbar_h -#define _internettoolbar_h +#pragma once static const int gBackCommandID = 0xa121; static const int gForwardCommandID = 0xa122; @@ -239,5 +238,3 @@ BEGIN_COM_MAP(CInternetToolbar) COM_INTERFACE_ENTRY_IID(IID_IBandSite, IBandSite) END_COM_MAP() }; - -#endif // _internettoolbar_h diff --git a/reactos/dll/win32/browseui/newatlinterfaces.h b/reactos/dll/win32/browseui/newatlinterfaces.h index 1cf33dcc53f..26e226efea8 100644 --- a/reactos/dll/win32/browseui/newatlinterfaces.h +++ b/reactos/dll/win32/browseui/newatlinterfaces.h @@ -18,8 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _newatlinteraces_h -#define _newatlinteraces_h +#pragma once template class IProfferServiceImpl : public IProfferService @@ -86,5 +85,3 @@ public: return hResult; } }; - -#endif // _newatlinteraces_h diff --git a/reactos/dll/win32/browseui/regtreeoptions.h b/reactos/dll/win32/browseui/regtreeoptions.h index 9df8ad6e05b..b8a34ee8276 100644 --- a/reactos/dll/win32/browseui/regtreeoptions.h +++ b/reactos/dll/win32/browseui/regtreeoptions.h @@ -18,8 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _regtreeoptions_h -#define _regtreeoptions_h +#pragma once class CRegTreeOptions : public CComCoClass, @@ -52,5 +51,3 @@ BEGIN_COM_MAP(CRegTreeOptions) COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) END_COM_MAP() }; - -#endif // _regtreeoptions_h diff --git a/reactos/dll/win32/browseui/utility.h b/reactos/dll/win32/browseui/utility.h index 4c73abb0d59..948b9abf03b 100644 --- a/reactos/dll/win32/browseui/utility.h +++ b/reactos/dll/win32/browseui/utility.h @@ -1,8 +1,4 @@ - -#ifndef _utility_h -#define _utility_h +#pragma once void *operator new(size_t size); void operator delete(void *p); - -#endif // _utility_h diff --git a/reactos/dll/win32/cards/cards.h b/reactos/dll/win32/cards/cards.h index 001cac6fe9d..20be102944a 100644 --- a/reactos/dll/win32/cards/cards.h +++ b/reactos/dll/win32/cards/cards.h @@ -18,8 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _CARDS_H -#define _CARDS_H +#pragma once /* * 52 card faces + @@ -58,5 +57,3 @@ BOOL WINAPI cdtDraw(HDC hdc, int x, int y, int card, int type, DWORD color); BOOL WINAPI cdtDrawExt(HDC hdc, int x, int y, int dx, int dy, int card, int suit, DWORD color); BOOL WINAPI cdtAnimate(HDC hdc, int cardback, int x, int y, int frame); void WINAPI cdtTerm(void); - -#endif /* _CARDS_H */ diff --git a/reactos/dll/win32/kernel32/include/kernel32.h b/reactos/dll/win32/kernel32/include/kernel32.h index ec6b78f5a21..60056f111f7 100755 --- a/reactos/dll/win32/kernel32/include/kernel32.h +++ b/reactos/dll/win32/kernel32/include/kernel32.h @@ -1,5 +1,4 @@ -#ifndef _KERNEL32_INCLUDE_KERNEL32_H -#define _KERNEL32_INCLUDE_KERNEL32_H +#pragma once #include "baseheap.h" @@ -191,6 +190,3 @@ IntGetCodePageEntry(UINT CodePage); LPWSTR GetDllLoadPath(LPCWSTR lpModule); - -#endif /* ndef _KERNEL32_INCLUDE_KERNEL32_H */ - diff --git a/reactos/dll/win32/kernel32/misc/lcformat_private.h b/reactos/dll/win32/kernel32/misc/lcformat_private.h index b6abc2774bc..0b00a820cd9 100644 --- a/reactos/dll/win32/kernel32/misc/lcformat_private.h +++ b/reactos/dll/win32/kernel32/misc/lcformat_private.h @@ -6,10 +6,7 @@ * PROGRAMMER: Dmitry Chapyshev (dmitry@reactos.org) */ -#ifndef __LCFORMAT_PRIVATE_H -#define __LCFORMAT_PRIVATE_H +#pragma once /*lcformat.c */ extern BOOL NLS_IsUnicodeOnlyLcid(LCID); - -#endif /* __LCFORMAT_PRIVATE_H */ diff --git a/reactos/dll/win32/msgina/msgina.h b/reactos/dll/win32/msgina/msgina.h index c7684cdf4e7..906681542dc 100644 --- a/reactos/dll/win32/msgina/msgina.h +++ b/reactos/dll/win32/msgina/msgina.h @@ -1,5 +1,4 @@ -#ifndef __MSGINA_H -#define __MSGINA_H +#pragma once #include #include @@ -60,6 +59,4 @@ DoLoginTasks( IN PWSTR Domain, IN PWSTR Password); -#endif /* __MSGINA_H */ - /* EOF */ diff --git a/reactos/dll/win32/msgina/resource.h b/reactos/dll/win32/msgina/resource.h index f2aff8cdaf8..4b5c4d8ec23 100644 --- a/reactos/dll/win32/msgina/resource.h +++ b/reactos/dll/win32/msgina/resource.h @@ -1,5 +1,4 @@ -#ifndef __MSGINA_RESOURCE_H -#define __MSGINA_RESOURCE_H +#pragma once #define IDC_STATIC -1 #define IDD_STATUSWINDOW_DLG 100 @@ -28,6 +27,4 @@ #define IDS_ASKFORPASSWORD 40004 #define IDS_FORCELOGOFF 40005 -#endif /* __MSGINA_RESOURCE_H */ - /* EOF */ diff --git a/reactos/dll/win32/user32/include/accel.h b/reactos/dll/win32/user32/include/accel.h index 25e67e66b70..0d55fb2beb1 100644 --- a/reactos/dll/win32/user32/include/accel.h +++ b/reactos/dll/win32/user32/include/accel.h @@ -1,8 +1,7 @@ /* $Id$ */ -#ifndef __USER32_ACCEL_H_INCLUDED__ -#define __USER32_ACCEL_H_INCLUDED__ +#pragma once /* ACCELERATOR TABLES CACHE */ /* Cache entry */ @@ -24,6 +23,4 @@ extern U32_ACCEL_CACHE_ENTRY * U32AccelCache; extern U32_ACCEL_CACHE_ENTRY ** WINAPI U32AccelCacheFind(HANDLE, HGLOBAL); extern void WINAPI U32AccelCacheAdd(HACCEL, HGLOBAL); -#endif - /* EOF */ diff --git a/reactos/dll/win32/user32/include/controls.h b/reactos/dll/win32/user32/include/controls.h index 262076a96e4..456763de8ac 100644 --- a/reactos/dll/win32/user32/include/controls.h +++ b/reactos/dll/win32/user32/include/controls.h @@ -1,5 +1,4 @@ -#ifndef _ROS_CONTROLS_H -#define _ROS_CONTROLS_H +#pragma once /* Missing from Winuser.h */ #define ES_COMBO 0x00000200 /* Undocumented. Parent is a combobox */ @@ -130,5 +129,3 @@ LRESULT WINAPI MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); LRESULT WINAPI StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL unicode); - -#endif /* _ROS_CONTROLS_H */ diff --git a/reactos/dll/win32/user32/include/menu.h b/reactos/dll/win32/user32/include/menu.h index bc039184e09..2a7397b7d80 100644 --- a/reactos/dll/win32/user32/include/menu.h +++ b/reactos/dll/win32/user32/include/menu.h @@ -5,8 +5,7 @@ * PURPOSE: Window management definitions */ -#ifndef __LIB_USER32_INCLUDE_MENU_H -#define __LIB_USER32_INCLUDE_MENU_H +#pragma once UINT MenuDrawMenuBar(HDC hDC, LPRECT Rect, HWND hWnd, BOOL Draw); @@ -21,5 +20,3 @@ MenuTrackKbdMenuBar(HWND hWnd, UINT wParam, WCHAR wChar); LRESULT WINAPI PopupMenuWndProcA(HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam); LRESULT WINAPI PopupMenuWndProcW(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); - -#endif /* __LIB_USER32_INCLUDE_MENU_H */ diff --git a/reactos/dll/win32/user32/include/message.h b/reactos/dll/win32/user32/include/message.h index 2cdb7e07b7c..b631d8f662a 100644 --- a/reactos/dll/win32/user32/include/message.h +++ b/reactos/dll/win32/user32/include/message.h @@ -6,8 +6,7 @@ * PURPOSE: Message management definitions */ -#ifndef LIB_USER32_INCLUDE_MESSAGE_H -#define LIB_USER32_INCLUDE_MESSAGE_H +#pragma once BOOL FASTCALL MessageInit(VOID); VOID FASTCALL MessageCleanup(VOID); @@ -21,6 +20,3 @@ IsCallProcHandle(IN WNDPROC lpWndProc) /* FIXME - check for 64 bit architectures... */ return ((ULONG_PTR)lpWndProc & 0xFFFF0000) == 0xFFFF0000; } - - -#endif /* LIB_USER32_INCLUDE_MESSAGE_H */ diff --git a/reactos/dll/win32/user32/include/regcontrol.h b/reactos/dll/win32/user32/include/regcontrol.h index 1dc2b6f1af3..1eb3d875be5 100644 --- a/reactos/dll/win32/user32/include/regcontrol.h +++ b/reactos/dll/win32/user32/include/regcontrol.h @@ -8,8 +8,7 @@ * REVISION HISTORY: 2003/06/16 GvG Created * NOTES: */ -#ifndef ROS_REGCONTROL_H -#define ROS_REGCONTROL_H +#pragma once #define IS_ATOM(x) \ (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000)) @@ -44,5 +43,3 @@ extern const struct builtin_class_descr SCROLL_builtin_class; extern const struct builtin_class_descr STATIC_builtin_class; ATOM WINAPI RegisterClassExWOWW(WNDCLASSEXW *,LPDWORD,WORD,DWORD,BOOL); - -#endif /* ROS_REGCONTROL_H */ diff --git a/reactos/dll/win32/user32/include/scroll.h b/reactos/dll/win32/user32/include/scroll.h index e543f518409..a3ad25f3917 100644 --- a/reactos/dll/win32/user32/include/scroll.h +++ b/reactos/dll/win32/user32/include/scroll.h @@ -6,11 +6,8 @@ * PURPOSE: Global user32 definitions */ -#ifndef USER32_SCROLL_H_INCLUDED -#define USER32_SCROLL_H_INCLUDED +#pragma once LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT uMsg, WPARAM wParam,LPARAM lParam ); LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT uMsg, WPARAM wParam,LPARAM lParam ); VOID FASTCALL ScrollTrackScrollBar(HWND Wnd, INT SBType, POINT Pt); - -#endif diff --git a/reactos/dll/win32/user32/include/user32p.h b/reactos/dll/win32/user32/include/user32p.h index 093482f507c..abf6843f40d 100644 --- a/reactos/dll/win32/user32/include/user32p.h +++ b/reactos/dll/win32/user32/include/user32p.h @@ -8,8 +8,7 @@ /* INCLUDES ******************************************************************/ -#ifndef USER32_PRIVATE_H -#define USER32_PRIVATE_H +#pragma once /* Private User32 Headers */ #include "accel.h" @@ -235,5 +234,4 @@ PVOID FASTCALL ValidateHandle(HANDLE, UINT); #define __EXCEPT_PAGE_FAULT else #define __ENDTRY -#endif /* EOF */ diff --git a/reactos/dll/win32/user32/include/winsta.h b/reactos/dll/win32/user32/include/winsta.h index d47120681ca..b4e52267dfd 100644 --- a/reactos/dll/win32/user32/include/winsta.h +++ b/reactos/dll/win32/user32/include/winsta.h @@ -6,10 +6,7 @@ * PURPOSE: Window stations */ -#ifndef USER32_WINSTA_H_INCLUDED -#define USER32_WINSTA_H_INCLUDED +#pragma once extern BOOL FASTCALL EnumNamesA(HWINSTA WindowStation, NAMEENUMPROCA EnumFunc, LPARAM Context, BOOL Desktops); extern BOOL FASTCALL EnumNamesW(HWINSTA WindowStation, NAMEENUMPROCW EnumFunc, LPARAM Context, BOOL Desktops); - -#endif /* USER32_WINSTA_H_INCLUDED */ diff --git a/reactos/dll/win32/ws2_32_new/inc/ws2_32.h b/reactos/dll/win32/ws2_32_new/inc/ws2_32.h index e81f7d56867..35cbb5bd542 100644 --- a/reactos/dll/win32/ws2_32_new/inc/ws2_32.h +++ b/reactos/dll/win32/ws2_32_new/inc/ws2_32.h @@ -5,8 +5,7 @@ * PURPOSE: WinSock 2.2 Main Header */ -#ifndef __WS2_32_H -#define __WS2_32_H +#pragma once /* Definitions for NDK Usage */ #define WIN32_NO_STATUS @@ -35,6 +34,3 @@ /* Internal headers */ #include "ws2_32p.h" - -#endif - diff --git a/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h b/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h index 39983492531..c3eb837b03b 100644 --- a/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h +++ b/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h @@ -5,8 +5,7 @@ * PURPOSE: WinSock 2.2 Main Header */ -#ifndef __WS2_32P_H -#define __WS2_32P_H +#pragma once #define WINSOCK_ROOT "System\\CurrentControlSet\\Services\\WinSock2\\Parameters" #define MAXALIASES 35 @@ -886,6 +885,3 @@ WsQuickPrologTid(LPWSATHREADID *Tid) return WsSlowPrologTid(Tid); } } - -#endif - diff --git a/reactos/drivers/base/kddll/kdcom.h b/reactos/drivers/base/kddll/kdcom.h index b7cc9af04b3..d6b6430e889 100644 --- a/reactos/drivers/base/kddll/kdcom.h +++ b/reactos/drivers/base/kddll/kdcom.h @@ -6,8 +6,7 @@ * PROGRAMMER: Timo Kreuzer (timo.kreuzer@ewactos.org) */ -#ifndef _KDCOM_H_ -#define _KDCOM_H_ +#pragma once #define COM_DAT 0x00 #define COM_IEN 0x01 /* interrupt enable register */ @@ -53,5 +52,3 @@ #define MSR_DSR 0x20 /* (complemented) state of data set ready (DSR). */ #define MSR_RI 0x40 /* (complemented) state of ring indicator (RI). */ #define MSR_DCD 0x80 /* (complemented) state of data carrier detect (DCD). */ - -#endif /* !_KDCOM_H_ */ diff --git a/reactos/drivers/base/kddll/kddll.h b/reactos/drivers/base/kddll/kddll.h index 81a20c5a1b5..76330922fc4 100644 --- a/reactos/drivers/base/kddll/kddll.h +++ b/reactos/drivers/base/kddll/kddll.h @@ -6,8 +6,7 @@ * PROGRAMMER: Timo Kreuzer (timo.kreuzer@ewactos.org) */ -#ifndef _KDDLL_H_ -#define _KDDLL_H_ +#pragma once #define NOEXTAPI #include @@ -80,6 +79,3 @@ NTAPI KdDebuggerInitialize0( IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL); #endif - - -#endif /* !_KDDLL_H_ */ diff --git a/reactos/drivers/bus/isapnp/isapnp.h b/reactos/drivers/bus/isapnp/isapnp.h index 003dbe823a4..59697b9848e 100644 --- a/reactos/drivers/bus/isapnp/isapnp.h +++ b/reactos/drivers/bus/isapnp/isapnp.h @@ -1,5 +1,4 @@ -#ifndef __ISAPNP_H -#define __ISAPNP_H +#pragma once #include @@ -337,5 +336,3 @@ DriverEntry( #ifdef __cplusplus } #endif - -#endif /* __ISAPNP_H */ diff --git a/reactos/drivers/bus/pci/pci.h b/reactos/drivers/bus/pci/pci.h index 5cd7e538704..2c4043396aa 100644 --- a/reactos/drivers/bus/pci/pci.h +++ b/reactos/drivers/bus/pci/pci.h @@ -1,5 +1,4 @@ -#ifndef __PCI_H -#define __PCI_H +#pragma once #include #include @@ -175,5 +174,3 @@ NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath); - -#endif /* __PCI_H */ diff --git a/reactos/drivers/bus/pci/pcidef.h b/reactos/drivers/bus/pci/pcidef.h index 75b6a494013..34407c4e856 100644 --- a/reactos/drivers/bus/pci/pcidef.h +++ b/reactos/drivers/bus/pci/pcidef.h @@ -17,8 +17,7 @@ * Casper S. Hornstrup (chorns@users.sourceforge.net) */ -#ifndef _PCIDEF_H -#define _PCIDEF_H +#pragma once /* * Under PCI, each device has 256 bytes of configuration address space, @@ -300,5 +299,3 @@ #define PCI_NUM_RESOURCES 11 #define PCI_REGION_FLAG_MASK 0x0f /* These bits of resource flags tell us the PCI region flags */ - -#endif /* _PCIDEF_H */ diff --git a/reactos/drivers/filesystems/fastfat_new/fat.h b/reactos/drivers/filesystems/fastfat_new/fat.h index 3e240c374c5..222755df5a1 100644 --- a/reactos/drivers/filesystems/fastfat_new/fat.h +++ b/reactos/drivers/filesystems/fastfat_new/fat.h @@ -1,5 +1,4 @@ -#ifndef __FAT_H__ -#define __FAT_H__ +#pragma once // // Might be a good idea to have this as a shared @@ -288,5 +287,3 @@ typedef struct _LONG_FILE_NAME_ENTRY { FAT_DIRENT_ATTR_HIDDEN | \ FAT_DIRENT_ATTR_SYSTEM | \ FAT_DIRENT_ATTR_VOLUME_ID) - -#endif//__FAT_H__ diff --git a/reactos/drivers/filesystems/fastfat_new/fatstruc.h b/reactos/drivers/filesystems/fastfat_new/fatstruc.h index 50661e1f0a0..dff04c59ec7 100644 --- a/reactos/drivers/filesystems/fastfat_new/fatstruc.h +++ b/reactos/drivers/filesystems/fastfat_new/fatstruc.h @@ -1,5 +1,4 @@ -#ifndef __STRUCT_H__ -#define __STRUCT_H__ +#pragma once typedef struct _FAT_SCAN_CONTEXT *PFAT_SCAN_CONTEXT; typedef struct _FAT_IO_CONTEXT *PFAT_IO_CONTEXT; @@ -404,5 +403,3 @@ typedef enum _FILE_TIME_INDEX #define CCB_SEARCH_PATTERN_HAS_WILD_CARD 0x04 #define CCB_DASD_IO 0x10 extern FAT_GLOBAL_DATA FatGlobalData; - -#endif//__STRUCT_H__ diff --git a/reactos/drivers/filesystems/mup/mup.h b/reactos/drivers/filesystems/mup/mup.h index 39a42ad29b1..7eca3a24f25 100644 --- a/reactos/drivers/filesystems/mup/mup.h +++ b/reactos/drivers/filesystems/mup/mup.h @@ -1,5 +1,4 @@ -#ifndef MUP_H -#define MUP_H +#pragma once #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) @@ -24,5 +23,3 @@ MupCreate(PDEVICE_OBJECT DeviceObject, NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); - -#endif /* MUP_H */ diff --git a/reactos/drivers/input/i8042prt/i8042prt.h b/reactos/drivers/input/i8042prt/i8042prt.h index e3f6478797f..035feaf9ea9 100644 --- a/reactos/drivers/input/i8042prt/i8042prt.h +++ b/reactos/drivers/input/i8042prt/i8042prt.h @@ -1,5 +1,4 @@ -#ifndef _I8042PRT_H_ -#define _I8042PRT_H_ +#pragma once #include #include @@ -452,5 +451,3 @@ NTSTATUS i8042AddLegacyKeyboard( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath); - -#endif // _I8042PRT_H_ diff --git a/reactos/drivers/ksfilter/ks/ksfunc.h b/reactos/drivers/ksfilter/ks/ksfunc.h index 99f0b202285..3395a94b0b6 100644 --- a/reactos/drivers/ksfilter/ks/ksfunc.h +++ b/reactos/drivers/ksfilter/ks/ksfunc.h @@ -1,5 +1,4 @@ -#ifndef KSFUNC_H__ -#define KSFUNC_H__ +#pragma once #include "ksiface.h" #include "kstypes.h" @@ -145,6 +144,3 @@ KspPropertyHandler( IN const KSPROPERTY_SET* PropertySet, IN PFNKSALLOCATOR Allocator OPTIONAL, IN ULONG PropertyItemSize OPTIONAL); - - -#endif diff --git a/reactos/drivers/ksfilter/ks/ksiface.h b/reactos/drivers/ksfilter/ks/ksiface.h index 8954528703a..ffea3ed8a7c 100644 --- a/reactos/drivers/ksfilter/ks/ksiface.h +++ b/reactos/drivers/ksfilter/ks/ksiface.h @@ -1,5 +1,4 @@ -#ifndef KSIFACE_H__ -#define KSIFACE_H__ +#pragma once #include #include @@ -308,5 +307,3 @@ DECLARE_INTERFACE_(IKsDevice, IUnknown) STDMETHOD_(NTSTATUS, CheckIoCapability)(THIS_ IN ULONG Unknown)PURE; }; - -#endif diff --git a/reactos/drivers/ksfilter/ks/kstypes.h b/reactos/drivers/ksfilter/ks/kstypes.h index 503fc01079e..a24464eec88 100644 --- a/reactos/drivers/ksfilter/ks/kstypes.h +++ b/reactos/drivers/ksfilter/ks/kstypes.h @@ -1,5 +1,4 @@ -#ifndef KSTYPES_H__ -#define KSTYPES_H__ +#pragma once #include #include @@ -158,6 +157,3 @@ typedef struct WCHAR BusIdentifier[1]; }BUS_ENUM_DEVICE_EXTENSION, *PBUS_ENUM_DEVICE_EXTENSION; - - -#endif diff --git a/reactos/drivers/ksfilter/ks/priv.h b/reactos/drivers/ksfilter/ks/priv.h index 6b9aced499f..cc0b8f95fef 100644 --- a/reactos/drivers/ksfilter/ks/priv.h +++ b/reactos/drivers/ksfilter/ks/priv.h @@ -1,5 +1,4 @@ -#ifndef PRIV_H__ -#define PRIV_H__ +#pragma once #define _KSDDK_ @@ -36,5 +35,3 @@ DEFINE_KSPROPERTY_TABLE(PinSet) {\ DEFINE_KSPROPERTY_ITEM_PIN_CONSTRAINEDDATARANGES(PropGeneral),\ DEFINE_KSPROPERTY_ITEM_PIN_PROPOSEDATAFORMAT(PropGeneral)\ } - -#endif diff --git a/reactos/drivers/ksfilter/swenum/precomp.h b/reactos/drivers/ksfilter/swenum/precomp.h index 6a357ef0b97..5706a0c84aa 100644 --- a/reactos/drivers/ksfilter/swenum/precomp.h +++ b/reactos/drivers/ksfilter/swenum/precomp.h @@ -1,13 +1,7 @@ -#ifndef PRECOMP_H__ -#define PRECOMP_H__ +#pragma once #include #include #include #include #include - - - - -#endif diff --git a/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.h b/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.h index e5e2a5b1cea..03a8c0b93a6 100644 --- a/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.h +++ b/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.h @@ -9,8 +9,7 @@ * Sept 26, 2003: Created */ -#ifndef __INCLUDES_MPU401_H__ -#define __INCLUDES_MPU401_H__ +#pragma once //#include //#include @@ -151,5 +150,3 @@ NTSTATUS NTAPI LoadSettings( NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); - -#endif diff --git a/reactos/drivers/multimedia/audio/sb16_nt4.old/sndblst.h b/reactos/drivers/multimedia/audio/sb16_nt4.old/sndblst.h index 16bfa097a16..31f3474b6d8 100644 --- a/reactos/drivers/multimedia/audio/sb16_nt4.old/sndblst.h +++ b/reactos/drivers/multimedia/audio/sb16_nt4.old/sndblst.h @@ -1,5 +1,4 @@ -#ifndef SNDBLST_H -#define SNDBLST_H +#pragma once #include #include @@ -151,5 +150,3 @@ StartSoundOutput( NTSTATUS EnableIrq( PDEVICE_OBJECT DeviceObject); - -#endif diff --git a/reactos/drivers/multimedia/audio/sndblst.old/sndblst.h b/reactos/drivers/multimedia/audio/sndblst.old/sndblst.h index 8afd207aa60..6d6e3b14464 100644 --- a/reactos/drivers/multimedia/audio/sndblst.old/sndblst.h +++ b/reactos/drivers/multimedia/audio/sndblst.old/sndblst.h @@ -9,8 +9,7 @@ * Sept 28, 2003: Created */ -#ifndef __INCLUDES_SNDBLST_H__ -#define __INCLUDES_SNDBLST_H__ +#pragma once #include @@ -172,5 +171,3 @@ VOID SetOutputSampleRate(ULONG BasePort, ULONG SampleRate); VOID EnableSpeaker(ULONG BasePort, BOOLEAN SpeakerOn); BOOLEAN IsSpeakerEnabled(ULONG BasePort); VOID BeginPlayback(ULONG BasePort, ULONG BitDepth, ULONG Channels, ULONG BlockSize); - -#endif diff --git a/reactos/drivers/multimedia/bdasup/precomp.h b/reactos/drivers/multimedia/bdasup/precomp.h index dda9c1bbc28..927bc960af2 100644 --- a/reactos/drivers/multimedia/bdasup/precomp.h +++ b/reactos/drivers/multimedia/bdasup/precomp.h @@ -1,5 +1,4 @@ -#ifndef PRECOMP_H__ -#define PRECOMP_H__ +#pragma once #include #include @@ -38,7 +37,3 @@ AllocateItem( VOID FreeItem( IN PVOID Item); - - - -#endif diff --git a/reactos/drivers/network/acd/include/acdapi.h b/reactos/drivers/network/acd/include/acdapi.h index ab8868f0f6d..40fa87ef317 100644 --- a/reactos/drivers/network/acd/include/acdapi.h +++ b/reactos/drivers/network/acd/include/acdapi.h @@ -8,9 +8,6 @@ * 25/05/2008 Created */ -#ifndef _ACDAPI_H -#define _ACDAPI_H +#pragma once #define FILE_DEVICE_RASACD 0xf1 - -#endif /* _ACDAPI_H */ diff --git a/reactos/drivers/network/afd/include/debug.h b/reactos/drivers/network/afd/include/debug.h index 6127fa4637e..f4ed29a3955 100644 --- a/reactos/drivers/network/afd/include/debug.h +++ b/reactos/drivers/network/afd/include/debug.h @@ -6,8 +6,8 @@ * DEFINES: DBG - Enable debug output * NASSERT - Disable assertions */ -#ifndef __DEBUG_H -#define __DEBUG_H + +#pragma once #define NORMAL_MASK 0x000000FF #define SPECIAL_MASK 0xFFFFFF00 @@ -89,6 +89,4 @@ extern DWORD DebugTraceLevel; #define CP CHECKPOINT -#endif /* __DEBUG_H */ - /* EOF */ diff --git a/reactos/drivers/network/afd/include/tdi_proto.h b/reactos/drivers/network/afd/include/tdi_proto.h index 93354baef25..a70c810e697 100644 --- a/reactos/drivers/network/afd/include/tdi_proto.h +++ b/reactos/drivers/network/afd/include/tdi_proto.h @@ -1,5 +1,4 @@ -#ifndef _TDI_PROTO_H -#define _TDI_PROTO_H +#pragma once NTSTATUS TdiConnect( PIRP *PendingIrp, PFILE_OBJECT ConnectionObject, @@ -45,5 +44,3 @@ NTSTATUS TdiQueryDeviceControl( PVOID OutputBuffer, ULONG OutputBufferLength, PULONG Return); - -#endif/*_TDI_PROTO_H*/ diff --git a/reactos/drivers/network/afd/include/tdiconn.h b/reactos/drivers/network/afd/include/tdiconn.h index 0ada133d961..54f83fc722a 100644 --- a/reactos/drivers/network/afd/include/tdiconn.h +++ b/reactos/drivers/network/afd/include/tdiconn.h @@ -1,5 +1,4 @@ -#ifndef _TDICONN_H -#define _TDICONN_H +#pragma once #ifdef _MSC_VER #include @@ -29,5 +28,3 @@ NTSTATUS TdiBuildConnectionInfoPair PTRANSPORT_ADDRESS From, PTRANSPORT_ADDRESS To ); PTA_ADDRESS TdiGetRemoteAddress( PTDI_CONNECTION_INFORMATION TdiConn ); - -#endif/*_TDICONN_H*/ diff --git a/reactos/drivers/network/dd/ne2000/include/8390.h b/reactos/drivers/network/dd/ne2000/include/8390.h index 29c724e8062..7776bc79d2d 100644 --- a/reactos/drivers/network/dd/ne2000/include/8390.h +++ b/reactos/drivers/network/dd/ne2000/include/8390.h @@ -4,8 +4,8 @@ * FILE: include/8390.h * PURPOSE: National Semiconductor 8390 NIC definitions */ -#ifndef __8390_H -#define __8390_H + +#pragma once /* Page 0 register layout (PS1 = 0, PS0 = 0) */ #define PG0_CR 0x00 /* Command Register (R/W) */ @@ -169,6 +169,4 @@ typedef struct _DISCARD_HEADER { VOID NTAPI MiniportHandleInterrupt( IN NDIS_HANDLE MiniportAdapterContext); -#endif /* __8390_H */ - /* EOF */ diff --git a/reactos/drivers/network/dd/ne2000/include/debug.h b/reactos/drivers/network/dd/ne2000/include/debug.h index 9f352f6dba3..f495766a059 100644 --- a/reactos/drivers/network/dd/ne2000/include/debug.h +++ b/reactos/drivers/network/dd/ne2000/include/debug.h @@ -6,8 +6,8 @@ * DEFINES: DBG - Enable debug output * NASSERT - Disable assertions */ -#ifndef __DEBUG_H -#define __DEBUG_H + +#pragma once #define NORMAL_MASK 0x000000FF #define SPECIAL_MASK 0xFFFFFF00 @@ -79,6 +79,4 @@ extern ULONG DebugTraceLevel; #define CHECKPOINT \ do { NDIS_DbgPrint(MIN_TRACE, ("%s:%d\n", __FILE__, __LINE__)); } while(0); -#endif /* __DEBUG_H */ - /* EOF */ diff --git a/reactos/drivers/network/dd/ne2000/include/ne2000.h b/reactos/drivers/network/dd/ne2000/include/ne2000.h index 167661978ea..0785c4187d2 100644 --- a/reactos/drivers/network/dd/ne2000/include/ne2000.h +++ b/reactos/drivers/network/dd/ne2000/include/ne2000.h @@ -4,8 +4,8 @@ * FILE: include/ne2000.h * PURPOSE: NE2000 driver definitions */ -#ifndef __NE2000_H -#define __NE2000_H + +#pragma once #define NDIS_MINIPORT_DRIVER 1 #define NDIS_LEGACY_MINIPORT 1 @@ -246,6 +246,4 @@ VOID NICWriteData( VOID NICTransmit( PNIC_ADAPTER Adapter); -#endif /* __NE2000_H */ - /* EOF */ diff --git a/reactos/drivers/network/dd/pcnet/pci.h b/reactos/drivers/network/dd/pcnet/pci.h index db0b8011133..d30a251d243 100644 --- a/reactos/drivers/network/dd/pcnet/pci.h +++ b/reactos/drivers/network/dd/pcnet/pci.h @@ -23,8 +23,7 @@ * 01-Sept-2003 vizzini - Created */ -#ifndef _PCI_ -#define _PCI_ +#pragma once /* PCI Config Space Offset Definitions */ #define PCI_PCIID 0x0 /* pci id - query 32 bits */ @@ -67,5 +66,3 @@ #define PCI_RTABORT 0x1000 /* received target abort */ #define PCI_SERR 0x2000 /* signalled error */ #define PCI_PERR 0x4000 /* parity error */ - -#endif /* _PCI_ */ diff --git a/reactos/drivers/network/dd/pcnet/pcnet.h b/reactos/drivers/network/dd/pcnet/pcnet.h index ebf898069d9..1a23ba53ec6 100644 --- a/reactos/drivers/network/dd/pcnet/pcnet.h +++ b/reactos/drivers/network/dd/pcnet/pcnet.h @@ -25,8 +25,7 @@ * - this assumes 32-bit physical addresses */ -#ifndef _PCNET_H_ -#define _PCNET_H_ +#pragma once /* statistics struct */ typedef struct _ADAPTER_STATS @@ -160,6 +159,3 @@ MiGetMediaDuplex(PADAPTER Adapter); /* memory pool tag */ #define PCNET_TAG 'tNcP' - -#endif // _PCNET_H_ - diff --git a/reactos/drivers/network/dd/pcnet/pcnethw.h b/reactos/drivers/network/dd/pcnet/pcnethw.h index 9e045c50b84..be79003834c 100644 --- a/reactos/drivers/network/dd/pcnet/pcnethw.h +++ b/reactos/drivers/network/dd/pcnet/pcnethw.h @@ -26,8 +26,7 @@ * PCNet II chip documentation (Am79C790A, pub# 19436). */ -#ifndef _PCNETHW_ -#define _PCNETHW_ +#pragma once /* when in 32-bit mode, most registers require the top 16 bits be 0. */ #define MASK16(__x__) ((__x__) & 0x0000ffff) @@ -414,5 +413,3 @@ typedef struct _TRANSMIT_DESCRIPTOR #define TD2_EXDEF 0x2000 /* excessive deferral */ #define TD2_UFLO 0x4000 /* buffer underflow */ #define TD2_BUFF 0x8000 /* buffer error */ - -#endif /* _PCNETHW_ */ diff --git a/reactos/drivers/network/lan/include/debug.h b/reactos/drivers/network/lan/include/debug.h index bef235757d8..fc72311e088 100644 --- a/reactos/drivers/network/lan/include/debug.h +++ b/reactos/drivers/network/lan/include/debug.h @@ -6,8 +6,8 @@ * DEFINES: DBG - Enable debug output * NASSERT - Disable assertions */ -#ifndef __DEBUG_H -#define __DEBUG_H + +#pragma once #define NORMAL_MASK 0x000000FF #define SPECIAL_MASK 0xFFFFFF00 @@ -96,7 +96,3 @@ extern DWORD DebugTraceLevel; #define CP CHECKPOINT #include - -#endif /* __DEBUG_H */ - -/* EOF */ diff --git a/reactos/drivers/network/lan/include/lan.h b/reactos/drivers/network/lan/include/lan.h index 431441fefa4..fb7e1e0a4e3 100644 --- a/reactos/drivers/network/lan/include/lan.h +++ b/reactos/drivers/network/lan/include/lan.h @@ -4,8 +4,8 @@ * FILE: include/lan.h * PURPOSE: LAN adapter definitions */ -#ifndef __LAN_H -#define __LAN_H + +#pragma once /* NDIS version this driver supports */ #define NDIS_VERSION_MAJOR 4 @@ -161,6 +161,4 @@ VOID CloseNdisPools(); PLAN_ADAPTER FindAdapterByIndex( PLAN_DEVICE_EXT DeviceExt, UINT Index ); -#endif /* __LAN_H */ - /* EOF */ diff --git a/reactos/drivers/network/lan/include/memtrack.h b/reactos/drivers/network/lan/include/memtrack.h index 62f45cc9b0e..a5b7dfd324f 100644 --- a/reactos/drivers/network/lan/include/memtrack.h +++ b/reactos/drivers/network/lan/include/memtrack.h @@ -1,5 +1,4 @@ -#ifndef MEMTRACK_H -#define MEMTRACK_H +#pragma once #ifndef FOURCC #define FOURCC(a,b,c,d) (((a)<<24)|((b)<<16)|((c)<<8)|(d)) @@ -19,5 +18,3 @@ #define exFreePool(x) ExFreePool(x) #define TrackWithTag(w,x,y,z) #define UntrackFL(x,y,z) - -#endif/*MEMMTRAC_H*/ diff --git a/reactos/drivers/network/lan/include/net_lan.h b/reactos/drivers/network/lan/include/net_lan.h index c61a7341a00..0a3223acfc6 100644 --- a/reactos/drivers/network/lan/include/net_lan.h +++ b/reactos/drivers/network/lan/include/net_lan.h @@ -1,4 +1,4 @@ -#ifndef _NET_LAN_H +#pragma once #include "net_wh.h" @@ -75,5 +75,3 @@ typedef struct _LAN_ADAPTER_INFO_S { (Types), \ sizeof(USHORT) * (NumTypes) ); \ } - -#endif/*_NET_LAN_H*/ diff --git a/reactos/drivers/network/lan/include/net_wh.h b/reactos/drivers/network/lan/include/net_wh.h index b277271db3c..b4736131836 100644 --- a/reactos/drivers/network/lan/include/net_wh.h +++ b/reactos/drivers/network/lan/include/net_wh.h @@ -1,5 +1,4 @@ -#ifndef _NET_WH_H -#define _NET_WH_H +#pragma once #ifdef i386 @@ -46,5 +45,3 @@ (w) #endif /* i386 */ - -#endif/*_NET_WH_H*/ diff --git a/reactos/drivers/network/lan/include/precomp.h b/reactos/drivers/network/lan/include/precomp.h index 31c14790fbc..33626a94f2e 100644 --- a/reactos/drivers/network/lan/include/precomp.h +++ b/reactos/drivers/network/lan/include/precomp.h @@ -1,5 +1,4 @@ -#ifndef _LAN_PRECOMP_H -#define _LAN_PRECOMP_H +#pragma once #include #include @@ -8,5 +7,3 @@ #include #include "net_lan.h" #include "lan.h" - -#endif/*_LAN_PRECOMP_H*/ diff --git a/reactos/drivers/network/ndis/include/buffer.h b/reactos/drivers/network/ndis/include/buffer.h index 62f9fce7bcf..b938cedb70d 100644 --- a/reactos/drivers/network/ndis/include/buffer.h +++ b/reactos/drivers/network/ndis/include/buffer.h @@ -4,8 +4,8 @@ * FILE: include/buffer.h * PURPOSE: Buffer management routine definitions */ -#ifndef __BUFFER_H -#define __BUFFER_H + +#pragma once #include "ndissys.h" @@ -57,6 +57,4 @@ UINT CopyPacketToBufferChain( UINT SrcOffset, UINT Length); -#endif /* __BUFFER_H */ - /* EOF */ diff --git a/reactos/drivers/network/ndis/include/debug.h b/reactos/drivers/network/ndis/include/debug.h index 7a4c40ee6ab..32cf70f78e0 100644 --- a/reactos/drivers/network/ndis/include/debug.h +++ b/reactos/drivers/network/ndis/include/debug.h @@ -5,8 +5,8 @@ * PURPOSE: Debugging support macros * DEFINES: DBG - Enable debug output */ -#ifndef __DEBUG_H -#define __DEBUG_H + +#pragma once #define NORMAL_MASK 0x000000FF #define SPECIAL_MASK 0xFFFFFF00 @@ -68,6 +68,4 @@ extern ULONG DebugTraceLevel; #define CP CHECKPOINT -#endif /* __DEBUG_H */ - /* EOF */ diff --git a/reactos/drivers/network/ndis/include/efilter.h b/reactos/drivers/network/ndis/include/efilter.h index 96d095dc562..3b564f740d2 100644 --- a/reactos/drivers/network/ndis/include/efilter.h +++ b/reactos/drivers/network/ndis/include/efilter.h @@ -5,8 +5,7 @@ * PURPOSE: Definitions for Ethernet filter */ -#ifndef __EFILTER_H -#define __EFILTER_H +#pragma once #define DECLARE_UNKNOWN_STRUCT(BaseName) \ typedef struct _##BaseName BaseName, *P##BaseName; @@ -76,7 +75,4 @@ NTAPI EthFilterDprIndicateReceiveComplete( IN PETH_FILTER Filter); -#endif /* __EFILTER_H */ - /* EOF */ - diff --git a/reactos/drivers/network/ndis/include/miniport.h b/reactos/drivers/network/ndis/include/miniport.h index 32aab60ace5..7dd615db1bf 100644 --- a/reactos/drivers/network/ndis/include/miniport.h +++ b/reactos/drivers/network/ndis/include/miniport.h @@ -5,8 +5,7 @@ * PURPOSE: Definitions for routines used by NDIS miniport drivers */ -#ifndef __MINIPORT_H -#define __MINIPORT_H +#pragma once #include #include @@ -197,7 +196,4 @@ VOID MiniDoAddressingReset( PLOGICAL_ADAPTER Adapter); -#endif /* __MINIPORT_H */ - /* EOF */ - diff --git a/reactos/drivers/network/ndis/include/protocol.h b/reactos/drivers/network/ndis/include/protocol.h index ecebc2d118c..99f92ea244d 100644 --- a/reactos/drivers/network/ndis/include/protocol.h +++ b/reactos/drivers/network/ndis/include/protocol.h @@ -5,8 +5,7 @@ * PURPOSE: Definitions for routines used by NDIS protocol drivers */ -#ifndef __PROTOCOL_H -#define __PROTOCOL_H +#pragma once typedef struct _PROTOCOL_BINDING { LIST_ENTRY ListEntry; /* Entry on global list */ @@ -70,7 +69,4 @@ NdisIPnPCancelStopDevice( NDIS_STATUS proSendPacketToMiniport(PLOGICAL_ADAPTER Adapter, PNDIS_PACKET Packet); -#endif /* __PROTOCOL_H */ - /* EOF */ - diff --git a/reactos/drivers/network/tcpip/include/address.h b/reactos/drivers/network/tcpip/include/address.h index 1bd1dbd5c15..7a9dacf8eba 100644 --- a/reactos/drivers/network/tcpip/include/address.h +++ b/reactos/drivers/network/tcpip/include/address.h @@ -4,8 +4,8 @@ * FILE: include/address.h * PURPOSE: Address manipulation prototypes */ -#ifndef __ADDRESS_H -#define __ADDRESS_H + +#pragma once /* * Initialize an IPv4 style address @@ -75,6 +75,4 @@ UINT AddrCountPrefixBits( PIP_ADDRESS Netmask ); VOID AddrWidenAddress( PIP_ADDRESS Network, PIP_ADDRESS Source, PIP_ADDRESS Netmask ); -#endif /* __ADDRESS_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/arp.h b/reactos/drivers/network/tcpip/include/arp.h index dd9f23a53af..710cbdb5cf0 100644 --- a/reactos/drivers/network/tcpip/include/arp.h +++ b/reactos/drivers/network/tcpip/include/arp.h @@ -4,8 +4,8 @@ * FILE: include/arp.h * PURPOSE: Address Resolution Protocol definitions */ -#ifndef __ARP_H -#define __ARP_H + +#pragma once typedef struct ARP_HEADER { USHORT HWType; /* Hardware Type */ @@ -30,6 +30,4 @@ VOID ARPReceive( PVOID Context, PIP_PACKET Packet); -#endif /* __ARP_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/checksum.h b/reactos/drivers/network/tcpip/include/checksum.h index 3ee66aedb78..0eb491033ab 100644 --- a/reactos/drivers/network/tcpip/include/checksum.h +++ b/reactos/drivers/network/tcpip/include/checksum.h @@ -4,8 +4,8 @@ * FILE: include/checksum.h * PURPOSE: Checksum routine definitions */ -#ifndef __CHECKSUM_H -#define __CHECKSUM_H + +#pragma once ULONG ChecksumFold( @@ -48,5 +48,3 @@ UDPv4ChecksumCalculate( (BOOLEAN)(TCPv4Checksum(Data, Count, \ TCPv4Checksum(TcpPseudoHeader, sizeof(TCPv4_PSEUDO_HEADER), \ 0)) == DH2N(0x0000FFFF)) - -#endif /* __CHECKSUM_H */ diff --git a/reactos/drivers/network/tcpip/include/datagram.h b/reactos/drivers/network/tcpip/include/datagram.h index f05107a7de1..29cf82ddff2 100644 --- a/reactos/drivers/network/tcpip/include/datagram.h +++ b/reactos/drivers/network/tcpip/include/datagram.h @@ -4,8 +4,8 @@ * FILE: include/datagram.h * PURPOSE: Datagram types and constants */ -#ifndef __DATAGRAM_H -#define __DATAGRAM_H + +#pragma once #include @@ -34,6 +34,4 @@ VOID DGDeliverData( PIP_PACKET IPPacket, UINT DataSize); -#endif /* __DATAGRAM_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/debug.h b/reactos/drivers/network/tcpip/include/debug.h index 7f6d86b8e27..303d66a5556 100644 --- a/reactos/drivers/network/tcpip/include/debug.h +++ b/reactos/drivers/network/tcpip/include/debug.h @@ -6,8 +6,8 @@ * DEFINES: DBG - Enable debug output * NASSERT - Disable assertions */ -#ifndef __DEBUG_H -#define __DEBUG_H + +#pragma once #define MIN_TRACE ((1 << DPFLTR_WARNING_LEVEL)) #define MID_TRACE ((1 << DPFLTR_WARNING_LEVEL) | (1 << DPFLTR_TRACE_LEVEL)) @@ -75,6 +75,4 @@ ASSERT(((PVOID)_x) != (PVOID)0xcccccccc); \ ASSERT(((PVOID)_x) >= (PVOID)0x80000000); -#endif /* __DEBUG_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/dispatch.h b/reactos/drivers/network/tcpip/include/dispatch.h index 6be0f269aed..9effe5f975d 100644 --- a/reactos/drivers/network/tcpip/include/dispatch.h +++ b/reactos/drivers/network/tcpip/include/dispatch.h @@ -4,8 +4,8 @@ * FILE: include/dispatch.h * PURPOSE: Dispatch routine prototypes */ -#ifndef __DISPATCH_H -#define __DISPATCH_H + +#pragma once typedef struct _DISCONNECT_TYPE { UINT Type; @@ -74,6 +74,4 @@ VOID DispDoDisconnect( NTSTATUS IRPFinish( PIRP Irp, NTSTATUS Status ); -#endif /* __DISPATCH_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/fileobjs.h b/reactos/drivers/network/tcpip/include/fileobjs.h index 12327701db8..d45ec7b7934 100644 --- a/reactos/drivers/network/tcpip/include/fileobjs.h +++ b/reactos/drivers/network/tcpip/include/fileobjs.h @@ -4,9 +4,8 @@ * FILE: include/fileobjs.h * PURPOSE: File object routine prototypes */ -#ifndef __FILEOBJS_H -#define __FILEOBJS_H +#pragma once extern LIST_ENTRY AddressFileListHead; extern KSPIN_LOCK AddressFileListLock; @@ -35,6 +34,4 @@ NTSTATUS FileOpenControlChannel( NTSTATUS FileCloseControlChannel( PTDI_REQUEST Request); -#endif /* __FILEOBJS_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/icmp.h b/reactos/drivers/network/tcpip/include/icmp.h index bb0e28a890a..aaaefa24b5f 100644 --- a/reactos/drivers/network/tcpip/include/icmp.h +++ b/reactos/drivers/network/tcpip/include/icmp.h @@ -4,8 +4,8 @@ * FILE: include/icmp.h * PURPOSE: Internet Control Message Protocol definitions */ -#ifndef __ICMP_H -#define __ICMP_H + +#pragma once typedef struct ICMP_HEADER { UCHAR Type; /* ICMP message type */ @@ -74,6 +74,4 @@ VOID ICMPReply( UCHAR Type, UCHAR Code); -#endif /* __ICMP_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/info.h b/reactos/drivers/network/tcpip/include/info.h index ee8a6d1cdfe..a05b0b2944e 100644 --- a/reactos/drivers/network/tcpip/include/info.h +++ b/reactos/drivers/network/tcpip/include/info.h @@ -4,8 +4,8 @@ * FILE: include/info.h * PURPOSE: TdiQueryInformation definitions */ -#ifndef __INFO_H -#define __INFO_H + +#pragma once #include @@ -194,6 +194,4 @@ VOID AddEntity(ULONG EntityType, VOID RemoveEntityByContext(PVOID Context); -#endif /* __INFO_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/interface.h b/reactos/drivers/network/tcpip/include/interface.h index 18b69b4ff30..c79bcabce3f 100644 --- a/reactos/drivers/network/tcpip/include/interface.h +++ b/reactos/drivers/network/tcpip/include/interface.h @@ -1,5 +1,4 @@ -#ifndef _TCPIP_INTERFACE_H -#define _TCPIP_INTERFACE_H +#pragma once #include @@ -16,5 +15,3 @@ NTSTATUS GetInterfaceName( PIP_INTERFACE Interface, PCHAR NameBuffer, NTSTATUS GetInterfaceConnectionStatus( PIP_INTERFACE Interface, PULONG OperStatus ); PIP_INTERFACE FindOnLinkInterface(PIP_ADDRESS Address); - -#endif//_TCPIP_INTERFACE_H diff --git a/reactos/drivers/network/tcpip/include/ip.h b/reactos/drivers/network/tcpip/include/ip.h index 068992f4839..dc6898d1d8a 100644 --- a/reactos/drivers/network/tcpip/include/ip.h +++ b/reactos/drivers/network/tcpip/include/ip.h @@ -4,8 +4,8 @@ * FILE: include/ip.h * PURPOSE: Internet Protocol related definitions */ -#ifndef __IP_H -#define __IP_H + +#pragma once typedef VOID (*OBJECT_FREE_ROUTINE)(PVOID Object); @@ -246,8 +246,4 @@ NTSTATUS IPStartup(PUNICODE_STRING RegistryPath); NTSTATUS IPShutdown(VOID); - - -#endif /* __IP_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/lan.h b/reactos/drivers/network/tcpip/include/lan.h index 7cdf49ac988..226d354e421 100644 --- a/reactos/drivers/network/tcpip/include/lan.h +++ b/reactos/drivers/network/tcpip/include/lan.h @@ -4,9 +4,8 @@ * FILE: include/lan.h * PURPOSE: LAN adapter definitions */ -#ifndef __LAN_H -#define __LAN_H +#pragma once /* Media we support */ #define MEDIA_ETH 0 @@ -108,6 +107,4 @@ NDIS_STATUS NDISCall( PVOID Buffer, UINT Length); -#endif /* __LAN_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/linux.h b/reactos/drivers/network/tcpip/include/linux.h index a4f3bf35e1f..9c4ad1c82ff 100755 --- a/reactos/drivers/network/tcpip/include/linux.h +++ b/reactos/drivers/network/tcpip/include/linux.h @@ -1,5 +1,4 @@ -#ifndef _LINUX_TYPES_H -#define _LINUX_TYPES_H +#pragma once #include @@ -1872,5 +1871,3 @@ struct pollfd { }; #endif /* poll */ - -#endif /* _LINUX_TYPES_H */ diff --git a/reactos/drivers/network/tcpip/include/lock.h b/reactos/drivers/network/tcpip/include/lock.h index 31ed91a8495..cac01ebeb6e 100644 --- a/reactos/drivers/network/tcpip/include/lock.h +++ b/reactos/drivers/network/tcpip/include/lock.h @@ -1,5 +1,4 @@ -#ifndef _LOCK_H -#define _LOCK_H +#pragma once extern KIRQL TcpipGetCurrentIrql(); extern VOID TcpipInitializeSpinLock( PKSPIN_LOCK SpinLock ); @@ -12,5 +11,3 @@ extern VOID TcpipInterlockedInsertTailList( PLIST_ENTRY ListHead, PKSPIN_LOCK Lock ); extern VOID TcpipAcquireFastMutex( PFAST_MUTEX Mutex ); extern VOID TcpipReleaseFastMutex( PFAST_MUTEX Mutex ); - -#endif/*_LOCK_H*/ diff --git a/reactos/drivers/network/tcpip/include/loopback.h b/reactos/drivers/network/tcpip/include/loopback.h index 02ba55f8723..9988a264dcc 100644 --- a/reactos/drivers/network/tcpip/include/loopback.h +++ b/reactos/drivers/network/tcpip/include/loopback.h @@ -4,8 +4,8 @@ * FILE: include/loopback.h * PURPOSE: Loopback adapter definitions */ -#ifndef __LOOPBACK_H -#define __LOOPBACK_H + +#pragma once #include @@ -18,6 +18,4 @@ NDIS_STATUS LoopRegisterAdapter( NDIS_STATUS LoopUnregisterAdapter( PLAN_ADAPTER Adapter); -#endif /* __LOOPBACK_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/neighbor.h b/reactos/drivers/network/tcpip/include/neighbor.h index 6f125f06c51..d35f64143d8 100644 --- a/reactos/drivers/network/tcpip/include/neighbor.h +++ b/reactos/drivers/network/tcpip/include/neighbor.h @@ -4,9 +4,8 @@ * FILE: include/neighbor.h * PURPOSE: Neighbor definitions */ -#ifndef __NEIGHBOR_H -#define __NEIGHBOR_H +#pragma once #define NB_HASHMASK 0xF /* Hash mask for neighbor cache */ @@ -103,6 +102,4 @@ ULONG NBCopyNeighbors( VOID NBResetNeighborTimeout( PIP_ADDRESS Address); -#endif /* __NEIGHBOR_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/pool.h b/reactos/drivers/network/tcpip/include/pool.h index 846fcea6935..93db9805870 100644 --- a/reactos/drivers/network/tcpip/include/pool.h +++ b/reactos/drivers/network/tcpip/include/pool.h @@ -4,12 +4,10 @@ * FILE: include/pool.h * PURPOSE: Prototypes for memory pooling */ -#ifndef __POOL_H -#define __POOL_H + +#pragma once NDIS_STATUS PrependPacket( PNDIS_PACKET Packet, PCHAR Data, UINT Len, BOOLEAN Copy ); -#endif /* __POOL_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/ports.h b/reactos/drivers/network/tcpip/include/ports.h index 3be359097fb..f63332b4fed 100644 --- a/reactos/drivers/network/tcpip/include/ports.h +++ b/reactos/drivers/network/tcpip/include/ports.h @@ -1,6 +1,3 @@ -#ifndef _TCPIP_PORTS_H -#define _TCPIP_PORTS_H - /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS TCP/IP protocol driver @@ -11,6 +8,8 @@ * arty 20041114 Created */ +#pragma once + typedef struct _PORT_SET { RTL_BITMAP ProtoBitmap; PVOID ProtoBitBuffer; @@ -27,5 +26,3 @@ VOID DeallocatePort( PPORT_SET PortSet, ULONG Port ); BOOLEAN AllocatePort( PPORT_SET PortSet, ULONG Port ); ULONG AllocateAnyPort( PPORT_SET PortSet ); ULONG AllocatePortFromRange( PPORT_SET PortSet, ULONG Lowest, ULONG Highest ); - -#endif/*_TCPIP_PORTS_H*/ diff --git a/reactos/drivers/network/tcpip/include/rawip.h b/reactos/drivers/network/tcpip/include/rawip.h index 872dec55cda..821fdb4f868 100644 --- a/reactos/drivers/network/tcpip/include/rawip.h +++ b/reactos/drivers/network/tcpip/include/rawip.h @@ -4,8 +4,8 @@ * FILE: include/rawip.h * PURPOSE: Raw IP types and constants */ -#ifndef __RAWIP_H -#define __RAWIP_H + +#pragma once NTSTATUS RawIPSendDatagram( PADDRESS_FILE AddrFile, @@ -36,6 +36,4 @@ NTSTATUS AddGenericHeaderIPv4( UINT ExtraLength, PVOID *NextHeader ); -#endif /* __RAWIP_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/receive.h b/reactos/drivers/network/tcpip/include/receive.h index 2681732bf23..6f78828067a 100644 --- a/reactos/drivers/network/tcpip/include/receive.h +++ b/reactos/drivers/network/tcpip/include/receive.h @@ -4,8 +4,8 @@ * FILE: include/receive.h * PURPOSE: Internet Protocol receive prototypes */ -#ifndef __RECEIVE_H -#define __RECEIVE_H + +#pragma once #include @@ -61,6 +61,4 @@ VOID IPReceive( PIP_INTERFACE IF, PIP_PACKET IPPacket); -#endif /* __RECEIVE_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/route.h b/reactos/drivers/network/tcpip/include/route.h index 19f1323bfbc..b92c984b96d 100644 --- a/reactos/drivers/network/tcpip/include/route.h +++ b/reactos/drivers/network/tcpip/include/route.h @@ -4,8 +4,8 @@ * FILE: include/route.h * PURPOSE: Routing cache definitions */ -#ifndef __ROUTE_H -#define __ROUTE_H + +#pragma once #include #include @@ -16,6 +16,4 @@ PNEIGHBOR_CACHE_ENTRY RouteGetRouteToDestination(PIP_ADDRESS Destination); -#endif /* __ROUTE_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/router.h b/reactos/drivers/network/tcpip/include/router.h index 73d2409f22a..6b2b2bb5010 100644 --- a/reactos/drivers/network/tcpip/include/router.h +++ b/reactos/drivers/network/tcpip/include/router.h @@ -4,8 +4,8 @@ * FILE: include/router.h * PURPOSE: IP routing definitions */ -#ifndef __ROUTER_H -#define __ROUTER_H + +#pragma once #include @@ -47,6 +47,4 @@ UINT CountFIBs(PIP_INTERFACE IF); UINT CopyFIBs( PIP_INTERFACE IF, PFIB_ENTRY Target ); -#endif /* __ROUTER_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/routines.h b/reactos/drivers/network/tcpip/include/routines.h index 1fda0e5aee8..223444244b0 100644 --- a/reactos/drivers/network/tcpip/include/routines.h +++ b/reactos/drivers/network/tcpip/include/routines.h @@ -4,9 +4,8 @@ * FILE: include/routines.h * PURPOSE: Common routine prototypes */ -#ifndef __ROUTINES_H -#define __ROUTINES_H +#pragma once UINT Random(VOID); @@ -71,6 +70,4 @@ VOID DisplayTCPPacket( #define DISPLAY_TCP_PACKET(x) #endif /* DBG */ -#endif /* __ROUTINES_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/tags.h b/reactos/drivers/network/tcpip/include/tags.h index 52c16a45cc9..bd552766e89 100644 --- a/reactos/drivers/network/tcpip/include/tags.h +++ b/reactos/drivers/network/tcpip/include/tags.h @@ -4,8 +4,8 @@ * FILE: include/tags.h * PURPOSE: Memory tags */ -#ifndef __TAGS_H -#define __TAGS_H + +#pragma once #define CONN_ENDPT_TAG 'pEnC' #define ADDR_FILE_TAG 'FrdA' @@ -35,5 +35,3 @@ #define OSK_SMALL_TAG 'SKSO' #define LAN_ADAPTER_TAG ' NAL' #define WQ_CONTEXT_TAG 'noCW' - -#endif diff --git a/reactos/drivers/network/tcpip/include/tcp.h b/reactos/drivers/network/tcpip/include/tcp.h index 4b5318f60bc..637900a5424 100644 --- a/reactos/drivers/network/tcpip/include/tcp.h +++ b/reactos/drivers/network/tcpip/include/tcp.h @@ -4,8 +4,8 @@ * FILE: include/tcp.h * PURPOSE: Transmission Control Protocol definitions */ -#ifndef __TCP_H -#define __TCP_H + +#pragma once typedef VOID (*PTCP_COMPLETION_ROUTINE)( PVOID Context, NTSTATUS Status, ULONG Count ); @@ -181,5 +181,3 @@ NTSTATUS TCPShutdown( VOID); BOOLEAN TCPRemoveIRP( PCONNECTION_ENDPOINT Connection, PIRP Irp ); - -#endif /* __TCP_H */ diff --git a/reactos/drivers/network/tcpip/include/tcpcore.h b/reactos/drivers/network/tcpip/include/tcpcore.h index 9478c817494..5034e859fa0 100755 --- a/reactos/drivers/network/tcpip/include/tcpcore.h +++ b/reactos/drivers/network/tcpip/include/tcpcore.h @@ -24,8 +24,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef __TCPCORE_H -#define __TCPCORE_H + +#pragma once #include "tcpdef.h" @@ -3853,4 +3853,3 @@ static __inline int tcp_paws_check(struct tcp_opt *tp, int rst) // #endif -#endif diff --git a/reactos/drivers/network/tcpip/include/tcpdef.h b/reactos/drivers/network/tcpip/include/tcpdef.h index e70e5ad38c3..fa77e9f0413 100755 --- a/reactos/drivers/network/tcpip/include/tcpdef.h +++ b/reactos/drivers/network/tcpip/include/tcpdef.h @@ -14,8 +14,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _LINUX_TCP_H -#define _LINUX_TCP_H + +#pragma once #include "linux.h" @@ -183,5 +183,3 @@ struct tcp_info __u32 tcpi_advmss; __u32 tcpi_reordering; }; - -#endif /* _LINUX_TCP_H */ diff --git a/reactos/drivers/network/tcpip/include/tcpip.h b/reactos/drivers/network/tcpip/include/tcpip.h index a9fefc9775d..563e662f602 100644 --- a/reactos/drivers/network/tcpip/include/tcpip.h +++ b/reactos/drivers/network/tcpip/include/tcpip.h @@ -11,8 +11,8 @@ * - Neighbor cache lock * - Route cache lock */ -#ifndef __TCPIP_H -#define __TCPIP_H + +#pragma once #ifdef _MSC_VER #include @@ -180,6 +180,4 @@ extern ULONG EntityMax; extern NTSTATUS TiGetProtocolNumber( PUNICODE_STRING FileName, PULONG Protocol ); -#endif /* __TCPIP_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/ticonsts.h b/reactos/drivers/network/tcpip/include/ticonsts.h index ca26064f111..ede93c91974 100644 --- a/reactos/drivers/network/tcpip/include/ticonsts.h +++ b/reactos/drivers/network/tcpip/include/ticonsts.h @@ -4,8 +4,8 @@ * FILE: include/ticonsts.h * PURPOSE: TCP/IP protocol driver constants */ -#ifndef __TICONSTS_H -#define __TICONSTS_H + +#pragma once /* NDIS version this driver supports */ #define NDIS_VERSION_MAJOR 4 @@ -59,6 +59,4 @@ #define IP_NO_RESOURCES 0x0001 /* Not enough free resources */ #define IP_NO_ROUTE_TO_DESTINATION 0x0002 /* No route to destination */ -#endif /* __TICONSTS_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/tilists.h b/reactos/drivers/network/tcpip/include/tilists.h index 3134522a00c..8200e0dd9f3 100644 --- a/reactos/drivers/network/tcpip/include/tilists.h +++ b/reactos/drivers/network/tcpip/include/tilists.h @@ -1,5 +1,4 @@ -#ifndef _TILISTS_H -#define _TILISTS_H +#pragma once #define TIPASTE(x,y) x ## y @@ -23,5 +22,3 @@ TIPASTE(n,Entry->Flink))); \ TIPASTE(n,Entry) = TIPASTE(n,Entry)->Flink; \ } - -#endif/*_TILISTS_H*/ diff --git a/reactos/drivers/network/tcpip/include/titypes.h b/reactos/drivers/network/tcpip/include/titypes.h index fb8ec7749d6..5400010db5e 100644 --- a/reactos/drivers/network/tcpip/include/titypes.h +++ b/reactos/drivers/network/tcpip/include/titypes.h @@ -4,8 +4,8 @@ * FILE: include/titypes.h * PURPOSE: TCP/IP protocol driver types */ -#ifndef __TITYPES_H -#define __TITYPES_H + +#pragma once /* * VOID ReferenceObject( @@ -306,6 +306,4 @@ typedef struct _TI_QUERY_CONTEXT { TCP_REQUEST_QUERY_INFORMATION_EX QueryInfo; } TI_QUERY_CONTEXT, *PTI_QUERY_CONTEXT; -#endif /* __TITYPES_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/transmit.h b/reactos/drivers/network/tcpip/include/transmit.h index f2ab2d308b3..cef0b998742 100644 --- a/reactos/drivers/network/tcpip/include/transmit.h +++ b/reactos/drivers/network/tcpip/include/transmit.h @@ -4,8 +4,8 @@ * FILE: include/transmit.h * PURPOSE: Internet Protocol transmit prototypes */ -#ifndef __TRANSMIT_H -#define __TRANSMIT_H + +#pragma once typedef VOID (*PIP_TRANSMIT_COMPLETE)( PVOID Context, PNDIS_PACKET Packet, @@ -33,6 +33,4 @@ typedef struct IPFRAGMENT_CONTEXT { NTSTATUS IPSendDatagram(PIP_PACKET IPPacket, PNEIGHBOR_CACHE_ENTRY NCE, PIP_TRANSMIT_COMPLETE Complete, PVOID Context); -#endif /* __TRANSMIT_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/udp.h b/reactos/drivers/network/tcpip/include/udp.h index 55547572a96..e5b52c042f9 100644 --- a/reactos/drivers/network/tcpip/include/udp.h +++ b/reactos/drivers/network/tcpip/include/udp.h @@ -4,8 +4,8 @@ * FILE: include/udp.h * PURPOSE: User Datagram Protocol definitions */ -#ifndef __UDP_H -#define __UDP_H + +#pragma once #define UDP_STARTING_PORT 0x8000 #define UDP_DYNAMIC_PORTS 0x8000 @@ -62,6 +62,4 @@ NTSTATUS UDPShutdown( UINT UDPAllocatePort( UINT HintPort ); VOID UDPFreePort( UINT Port ); -#endif /* __UDP_H */ - /* EOF */ diff --git a/reactos/drivers/network/tcpip/include/wait.h b/reactos/drivers/network/tcpip/include/wait.h index 655fcd5ab72..37a841d9773 100644 --- a/reactos/drivers/network/tcpip/include/wait.h +++ b/reactos/drivers/network/tcpip/include/wait.h @@ -1,10 +1,7 @@ -#ifndef _TCPIP_WAIT_H -#define _TCPIP_WAIT_H +#pragma once NTSTATUS TcpipWaitForSingleObject( PVOID Object, KWAIT_REASON Reason, KPROCESSOR_MODE WaitMode, BOOLEAN Alertable, PLARGE_INTEGER Timeout ); - -#endif/*_TCPIP_WAIT_H*/ diff --git a/reactos/drivers/parallel/parallel/parallel.h b/reactos/drivers/parallel/parallel/parallel.h index c28e27e45fa..bf09f1ac4e9 100644 --- a/reactos/drivers/parallel/parallel/parallel.h +++ b/reactos/drivers/parallel/parallel/parallel.h @@ -1,5 +1,4 @@ -#ifndef _LINUX_LP_H -#define _LINUX_LP_H +#pragma once /* * usr/include/linux/lp.h c.1991-1992 James Wiegand @@ -133,5 +132,3 @@ * It is used only in the lp_init() routine. */ #define LP_DELAY 150000 - -#endif diff --git a/reactos/drivers/storage/class/include/class2.h b/reactos/drivers/storage/class/include/class2.h index 786233c7ad0..efd55a7f94d 100644 --- a/reactos/drivers/storage/class/include/class2.h +++ b/reactos/drivers/storage/class/include/class2.h @@ -7,8 +7,7 @@ * PROGRAMMER: Eric Kohl */ -#ifndef __INCLUDE_DDK_CLASS2_H -#define __INCLUDE_DDK_CLASS2_H +#pragma once #include "ntddscsi.h" #include "srb.h" @@ -265,7 +264,4 @@ ScsiClassCheckVerifyComplete( IN PVOID Context ); - -#endif /* __INCLUDE_DDK_CLASS2_H */ - /* EOF */ diff --git a/reactos/drivers/storage/port/buslogic/BT958dt.h b/reactos/drivers/storage/port/buslogic/BT958dt.h index fea7c9013c4..51dce2c11f9 100644 --- a/reactos/drivers/storage/port/buslogic/BT958dt.h +++ b/reactos/drivers/storage/port/buslogic/BT958dt.h @@ -20,9 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -#ifndef _BT958dt_h_ -#define _BT958dt_h_ +#pragma once // BT958ExtendedSetupInfoGuid - BT958ExtendedSetupInfo // BT958 Extended Setup Information (Operation Code 8Dh) @@ -101,5 +99,3 @@ typedef struct _BT958ExtendedSetupInfo #define BT958ExtendedSetupInfo_HostSmartTermination_ID 13 } BT958ExtendedSetupInfo, *PBT958ExtendedSetupInfo; - -#endif diff --git a/reactos/drivers/storage/port/buslogic/BusLogic958.h b/reactos/drivers/storage/port/buslogic/BusLogic958.h index 4af8d0a78f4..9ca15dec94c 100644 --- a/reactos/drivers/storage/port/buslogic/BusLogic958.h +++ b/reactos/drivers/storage/port/buslogic/BusLogic958.h @@ -34,8 +34,7 @@ // Prototype for functions -#ifndef _BT958_H_ -#define _BT958_H_ +#pragma once #include #include @@ -1182,5 +1181,3 @@ BusLogic_IncrementErrorCounter(unsigned short *ErrorCounter) if (*ErrorCounter < 65535) (*ErrorCounter)++; } //____________________________________________________________________________________________ - -#endif // _BT958_H_ diff --git a/reactos/drivers/usb/usbehci/usbehci.h b/reactos/drivers/usb/usbehci/usbehci.h index d125437d5ff..f4c440df616 100644 --- a/reactos/drivers/usb/usbehci/usbehci.h +++ b/reactos/drivers/usb/usbehci/usbehci.h @@ -1,6 +1,4 @@ - -#ifndef __EHCI_H__ -#define __EHCI_H__ +#pragma once #include #include @@ -421,5 +419,3 @@ URBRequestCancel (PDEVICE_OBJECT DeviceObject, PIRP Irp); VOID NTAPI DeviceArrivalWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context); - -#endif diff --git a/reactos/drivers/usb/usbehci/usbiffn.h b/reactos/drivers/usb/usbehci/usbiffn.h index 988d2345b62..e9c2de469be 100644 --- a/reactos/drivers/usb/usbehci/usbiffn.h +++ b/reactos/drivers/usb/usbehci/usbiffn.h @@ -1,5 +1,4 @@ -#ifndef __USBIFFN_H__ -#define __USBIFFN_H__ +#pragma once #define USB_BUSIFFN __stdcall #include @@ -195,6 +194,3 @@ IsDeviceHighSpeed(PVOID BusCOntext); NTSTATUS USB_BUSIFFN EnumLogEntry(PVOID BusContext, ULONG DriverTag, ULONG EnumTag, ULONG P1, ULONG P2); - -#endif - diff --git a/reactos/drivers/video/displays/framebuf/framebuf.h b/reactos/drivers/video/displays/framebuf/framebuf.h index 3a18e860509..7f222c8ce84 100644 --- a/reactos/drivers/video/displays/framebuf/framebuf.h +++ b/reactos/drivers/video/displays/framebuf/framebuf.h @@ -18,8 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef FRAMEBUF_H -#define FRAMEBUF_H +#pragma once #include #include @@ -160,5 +159,3 @@ IntSetPalette( IN PPALETTEENTRY ppalent, IN ULONG iStart, IN ULONG cColors); - -#endif /* FRAMEBUF_H */ diff --git a/reactos/drivers/video/displays/framebufacc/framebufacc.h b/reactos/drivers/video/displays/framebufacc/framebufacc.h index 8f8f05a5e48..bd38ca2adaf 100644 --- a/reactos/drivers/video/displays/framebufacc/framebufacc.h +++ b/reactos/drivers/video/displays/framebufacc/framebufacc.h @@ -18,8 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef FRAMEBUF_H -#define FRAMEBUF_H +#pragma once #include #include @@ -197,5 +196,3 @@ CopyColorPointer(PPDEV ppdev, SURFOBJ *psoMask, SURFOBJ *psoColor, XLATEOBJ *pxlo); - -#endif /* FRAMEBUF_H */ diff --git a/reactos/drivers/video/displays/vga/vgaddi.h b/reactos/drivers/video/displays/vga/vgaddi.h index 7b4a3c606a7..97282f882dc 100644 --- a/reactos/drivers/video/displays/vga/vgaddi.h +++ b/reactos/drivers/video/displays/vga/vgaddi.h @@ -1,5 +1,4 @@ -#ifndef _VGADDI_H_ -#define _VGADDI_H_ +#pragma once #define _WINBASE_ #define _WINDOWS_H @@ -288,5 +287,3 @@ vgaReadScan(int x, int y, int w, void *b); VOID FASTCALL vgaWriteScan(int x, int y, int w, void *b); - -#endif /* _VGADDI_H_ */ diff --git a/reactos/drivers/video/miniport/vbe/vbemp.h b/reactos/drivers/video/miniport/vbe/vbemp.h index c5423bd0629..7abf14408a5 100644 --- a/reactos/drivers/video/miniport/vbe/vbemp.h +++ b/reactos/drivers/video/miniport/vbe/vbemp.h @@ -18,8 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef VBEMP_H -#define VBEMP_H +#pragma once /* INCLUDES *******************************************************************/ @@ -313,5 +312,3 @@ VBESetColorRegisters( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_CLUT ColorLookUpTable, PSTATUS_BLOCK StatusBlock); - -#endif /* VBEMP_H */ diff --git a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h b/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h index 422e25f03f4..55bc208107c 100644 --- a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h +++ b/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h @@ -20,8 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef XBOXVMP_H -#define XBOXVMP_H +#pragma once /* INCLUDES *******************************************************************/ @@ -157,6 +156,4 @@ XboxVmpSetColorRegisters( PVIDEO_CLUT ColorLookUpTable, PSTATUS_BLOCK StatusBlock); -#endif /* XBOXVMP_H */ - /* EOF */ diff --git a/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h b/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h index 4230e55ad52..f3c0b980e86 100644 --- a/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h +++ b/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h @@ -24,8 +24,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MAIN_H_ -#define _MAIN_H_ + +#pragma once #include @@ -78,6 +78,4 @@ CMIDATA cmiData; HWAVEOUT hWave; WAVEHDR pwh; int currentChannelCount; -HFONT hURLFont; - -#endif //_MAIN_H_ \ No newline at end of file +HFONT hURLFont; \ No newline at end of file diff --git a/reactos/drivers/wdm/audio/drivers/CMIDriver/installer/main.h b/reactos/drivers/wdm/audio/drivers/CMIDriver/installer/main.h index c8cefe5406a..583a24d0ab5 100644 --- a/reactos/drivers/wdm/audio/drivers/CMIDriver/installer/main.h +++ b/reactos/drivers/wdm/audio/drivers/CMIDriver/installer/main.h @@ -25,8 +25,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _MAIN_H_ -#define _MAIN_H_ +#pragma once #include #include @@ -75,7 +74,4 @@ const char DisplayName[] = _T("CMI 8738/8768 Audio Driver (remove only)"); const char DisplayIcon[] = _T("\\cmicontrol.exe,0"); const char Uninstaller[] = _T("\\cmicontrol.exe /uninstall"); const char Publisher[] = _T("Dogbert "); -const char URLInfoAbout[] = _T("http://cmediadrivers.googlepages.com/"); - - -#endif //_MAIN_H_ \ No newline at end of file +const char URLInfoAbout[] = _T("http://cmediadrivers.googlepages.com/"); \ No newline at end of file diff --git a/reactos/drivers/wdm/audio/drivers/CMIDriver/property.h b/reactos/drivers/wdm/audio/drivers/CMIDriver/property.h index 7e6593dfed2..4ecb4126276 100644 --- a/reactos/drivers/wdm/audio/drivers/CMIDriver/property.h +++ b/reactos/drivers/wdm/audio/drivers/CMIDriver/property.h @@ -25,8 +25,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _PROPERTY_H_ -#define _PROPERTY_H_ +#pragma once //GUID for the private property // {2B81CDBB-EE6C-4ECC-8AA5-9A188B023DFF} @@ -84,5 +83,3 @@ typedef struct UInt32 formatMask; UInt32 enableSPDI; } CMIDATA; - -#endif //_PROPERTY_H_ diff --git a/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h b/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h index 70bdc6e1059..18c82c191a4 100644 --- a/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h +++ b/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h @@ -1,5 +1,4 @@ -#ifndef KMIXER_H__ -#define KMIXER_H__ +#pragma once #include #include @@ -35,6 +34,3 @@ KMixAllocateDeviceHeader( NTSTATUS CreatePin( IN PIRP Irp); - - -#endif diff --git a/reactos/drivers/wdm/audio/filters/splitter/precomp.h b/reactos/drivers/wdm/audio/filters/splitter/precomp.h index 7492e214cf7..76ad7f10f4b 100644 --- a/reactos/drivers/wdm/audio/filters/splitter/precomp.h +++ b/reactos/drivers/wdm/audio/filters/splitter/precomp.h @@ -1,5 +1,4 @@ -#ifndef PRECOMP_H__ -#define PRECOMP_H__ +#pragma once #include #include @@ -65,6 +64,3 @@ typedef struct ULONG BytesAvailable; ULONG BytesProcessed; }PIN_CONTEXT, *PPIN_CONTEXT; - - -#endif diff --git a/reactos/drivers/wdm/audio/legacy/stream/stream.h b/reactos/drivers/wdm/audio/legacy/stream/stream.h index 742eaf02d52..6208d3a79eb 100644 --- a/reactos/drivers/wdm/audio/legacy/stream/stream.h +++ b/reactos/drivers/wdm/audio/legacy/stream/stream.h @@ -1,5 +1,4 @@ -#ifndef STREAM_H__ -#define STREAM_H__ +#pragma once #include #define YDEBUG @@ -136,5 +135,3 @@ CompleteIrp( IN PIRP Irp, IN NTSTATUS Status, IN ULONG_PTR Information); - -#endif diff --git a/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h b/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h index d764459f7ea..211045cf0c9 100644 --- a/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h +++ b/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h @@ -1,5 +1,4 @@ -#ifndef INTERFACE_H__ -#define INTERFACE_H__ +#pragma once /// /// WDMAUD Interface Definition @@ -375,4 +374,3 @@ typedef struct 17, \ METHOD_BUFFERED, \ FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS) -#endif diff --git a/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h b/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h index c0dcfcca848..459b6c775b8 100644 --- a/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h +++ b/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h @@ -1,5 +1,4 @@ -#ifndef WDMAUD_H__ -#define WDMAUD_H__ +#pragma once #include #include @@ -277,6 +276,3 @@ WdmAudGetPnpNameByIndexAndType( ULONG GetSysAudioDeviceCount( IN PDEVICE_OBJECT DeviceObject); - - -#endif diff --git a/reactos/drivers/wdm/audio/sysaudio/sysaudio.h b/reactos/drivers/wdm/audio/sysaudio/sysaudio.h index 15ca8caf554..01537b0a298 100644 --- a/reactos/drivers/wdm/audio/sysaudio/sysaudio.h +++ b/reactos/drivers/wdm/audio/sysaudio/sysaudio.h @@ -1,5 +1,4 @@ -#ifndef SYSAUDIO_H__ -#define SYSAUDIO_H__ +#pragma once #include #include @@ -133,6 +132,3 @@ ComputeCompatibleFormat( IN ULONG PinId, IN PKSDATAFORMAT_WAVEFORMATEX ClientFormat, OUT PKSDATAFORMAT_WAVEFORMATEX MixerFormat); - - -#endif diff --git a/reactos/hal/halarm/include/halp.h b/reactos/hal/halarm/include/halp.h index 5ee60dd9058..8a14dd36226 100644 --- a/reactos/hal/halarm/include/halp.h +++ b/reactos/hal/halarm/include/halp.h @@ -1,5 +1,4 @@ -#ifndef __INTERNAL_HAL_HAL_H -#define __INTERNAL_HAL_HAL_H +#pragma once // // ARM Headers @@ -58,5 +57,3 @@ VOID HalpClockInterrupt(VOID); VOID HalpProfileInterrupt(VOID); extern ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount; - -#endif /* __INTERNAL_HAL_HAL_H */ diff --git a/reactos/hal/halppc/include/apic.h b/reactos/hal/halppc/include/apic.h index 92497b82251..ee0089bf6fc 100644 --- a/reactos/hal/halppc/include/apic.h +++ b/reactos/hal/halppc/include/apic.h @@ -2,8 +2,7 @@ * */ -#ifndef __INTERNAL_HAL_APIC_H -#define __INTERNAL_HAL_APIC_H +#pragma once #define APIC_DEFAULT_BASE 0xFEE00000 /* Default Local APIC Base Register Address */ @@ -206,9 +205,4 @@ static __inline ULONG ThisCPU(VOID) return (APICRead(APIC_ID) & APIC_ID_MASK) >> 24; } - -#endif - - /* EOF */ - diff --git a/reactos/hal/halppc/include/bus.h b/reactos/hal/halppc/include/bus.h index 2c82d3ed61d..e13c5ac6879 100644 --- a/reactos/hal/halppc/include/bus.h +++ b/reactos/hal/halppc/include/bus.h @@ -1,5 +1,4 @@ -#ifndef __INTERNAL_HAL_BUS_H -#define __INTERNAL_HAL_BUS_H +#pragma once // // Helper Macros @@ -289,8 +288,4 @@ extern BOOLEAN HalpPCIConfigInitialized; extern BUS_HANDLER HalpFakePciBusHandler; extern ULONG HalpMinPciBus, HalpMaxPciBus; -#endif /* __INTERNAL_HAL_BUS_H */ - /* EOF */ - - diff --git a/reactos/hal/halppc/include/haldma.h b/reactos/hal/halppc/include/haldma.h index 1770770e135..2da2c1f523a 100644 --- a/reactos/hal/halppc/include/haldma.h +++ b/reactos/hal/halppc/include/haldma.h @@ -1,5 +1,4 @@ -#ifndef HALDMA_H -#define HALDMA_H +#pragma once /* * DMA Page Register Structure @@ -379,5 +378,3 @@ HalpGetDmaAdapter( ULONG NTAPI HalpDmaGetDmaAlignment( PADAPTER_OBJECT AdapterObject); - -#endif /* HALDMA_H */ diff --git a/reactos/hal/halppc/include/halirq.h b/reactos/hal/halppc/include/halirq.h index 5421415db38..c3cc625dca4 100644 --- a/reactos/hal/halppc/include/halirq.h +++ b/reactos/hal/halppc/include/halirq.h @@ -2,8 +2,7 @@ * $Id: halirq.h 23669 2006-08-23 16:58:43Z ion $ */ -#ifndef __INCLUDE_HAL_HALIRQ -#define __INCLUDE_HAL_HALIRQ +#pragma once #ifdef CONFIG_SMP @@ -31,5 +30,3 @@ #define IRQ2VECTOR(irq) ((irq) + IRQ_BASE) #endif - -#endif /* __INCLUDE_HAL_HALIRQ */ diff --git a/reactos/hal/halppc/include/halp.h b/reactos/hal/halppc/include/halp.h index e88eec6f214..0b21d7053bf 100644 --- a/reactos/hal/halppc/include/halp.h +++ b/reactos/hal/halppc/include/halp.h @@ -2,8 +2,7 @@ * */ -#ifndef __INTERNAL_HAL_HAL_H -#define __INTERNAL_HAL_HAL_H +#pragma once /* Temporary hack */ #define KPCR_BASE 0xFF000000 @@ -125,5 +124,3 @@ typedef struct tagHALP_HOOKS extern HALP_HOOKS HalpHooks; extern KSPIN_LOCK HalpSystemHardwareLock; - -#endif /* __INTERNAL_HAL_HAL_H */ diff --git a/reactos/hal/halppc/include/ioapic.h b/reactos/hal/halppc/include/ioapic.h index bcdd7fe8ec1..7f4ab434df5 100644 --- a/reactos/hal/halppc/include/ioapic.h +++ b/reactos/hal/halppc/include/ioapic.h @@ -2,8 +2,7 @@ * */ -#ifndef __INTERNAL_HAL_IOAPIC_H -#define __INTERNAL_HAL_IOAPIC_H +#pragma once /* I/O APIC Register Address Map */ #define IOAPIC_IOREGSEL 0x0000 /* I/O Register Select (index) (R/W) */ @@ -95,9 +94,4 @@ VOID HaliReconfigurePciInterrupts(VOID); /* For debugging */ VOID IOAPICDump(VOID); -#endif - - - /* EOF */ - diff --git a/reactos/hal/halppc/include/mps.h b/reactos/hal/halppc/include/mps.h index 83f9cfbe501..ba766958280 100644 --- a/reactos/hal/halppc/include/mps.h +++ b/reactos/hal/halppc/include/mps.h @@ -1,5 +1,4 @@ -#ifndef __INCLUDE_HAL_MPS -#define __INCLUDE_HAL_MPS +#pragma once /* * FIXME: This does not work if we have more than 24 IRQs (ie. more than one @@ -198,7 +197,4 @@ typedef struct _MP_CONFIGURATION_INTLOCAL VOID HalpInitMPS(VOID); - -#endif /* __INCLUDE_HAL_MPS */ - /* EOF */ diff --git a/reactos/hal/halx86/include/apic.h b/reactos/hal/halx86/include/apic.h index 1625e9d0ece..315af0a6b3e 100644 --- a/reactos/hal/halx86/include/apic.h +++ b/reactos/hal/halx86/include/apic.h @@ -2,8 +2,7 @@ * */ -#ifndef __INTERNAL_HAL_APIC_H -#define __INTERNAL_HAL_APIC_H +#pragma once #ifdef _M_AMD64 #define APIC_DEFAULT_BASE 0xfffffffffee00000ULL; @@ -251,6 +250,4 @@ static __inline VOID APICSendEOI(VOID) APICWrite(APIC_EOI, 0); } -#endif /* __INTERNAL_HAL_APIC_H */ - /* EOF */ diff --git a/reactos/hal/halx86/include/bus.h b/reactos/hal/halx86/include/bus.h index 295bc5d3a6e..81b5e5f1b07 100644 --- a/reactos/hal/halx86/include/bus.h +++ b/reactos/hal/halx86/include/bus.h @@ -1,5 +1,4 @@ -#ifndef __INTERNAL_HAL_BUS_H -#define __INTERNAL_HAL_BUS_H +#pragma once // // Helper Macros @@ -363,8 +362,4 @@ extern BOOLEAN HalpPCIConfigInitialized; extern BUS_HANDLER HalpFakePciBusHandler; extern ULONG HalpMinPciBus, HalpMaxPciBus; -#endif /* __INTERNAL_HAL_BUS_H */ - /* EOF */ - - diff --git a/reactos/hal/halx86/include/haldma.h b/reactos/hal/halx86/include/haldma.h index 1770770e135..2da2c1f523a 100644 --- a/reactos/hal/halx86/include/haldma.h +++ b/reactos/hal/halx86/include/haldma.h @@ -1,5 +1,4 @@ -#ifndef HALDMA_H -#define HALDMA_H +#pragma once /* * DMA Page Register Structure @@ -379,5 +378,3 @@ HalpGetDmaAdapter( ULONG NTAPI HalpDmaGetDmaAlignment( PADAPTER_OBJECT AdapterObject); - -#endif /* HALDMA_H */ diff --git a/reactos/hal/halx86/include/halirq.h b/reactos/hal/halx86/include/halirq.h index baec1f854ed..63dec6e62e8 100644 --- a/reactos/hal/halx86/include/halirq.h +++ b/reactos/hal/halx86/include/halirq.h @@ -2,8 +2,7 @@ * $Id$ */ -#ifndef __INCLUDE_HAL_HALIRQ -#define __INCLUDE_HAL_HALIRQ +#pragma once #ifdef CONFIG_SMP @@ -31,5 +30,3 @@ #define IRQ2VECTOR(irq) ((irq) + IRQ_BASE) #endif - -#endif /* __INCLUDE_HAL_HALIRQ */ diff --git a/reactos/hal/halx86/include/halp.h b/reactos/hal/halx86/include/halp.h index ec25e71acf6..16c82dfabfc 100644 --- a/reactos/hal/halx86/include/halp.h +++ b/reactos/hal/halx86/include/halp.h @@ -2,8 +2,7 @@ * */ -#ifndef __INTERNAL_HAL_HAL_H -#define __INTERNAL_HAL_HAL_H +#pragma once typedef struct _HAL_BIOS_FRAME { @@ -805,5 +804,3 @@ extern KSPIN_LOCK HalpSystemHardwareLock; extern PADDRESS_USAGE HalpAddressUsageList; extern LARGE_INTEGER HalpPerfCounter; - -#endif /* __INTERNAL_HAL_HAL_H */ diff --git a/reactos/hal/halx86/include/ioapic.h b/reactos/hal/halx86/include/ioapic.h index c038c2a5b1f..28225c54f72 100644 --- a/reactos/hal/halx86/include/ioapic.h +++ b/reactos/hal/halx86/include/ioapic.h @@ -2,8 +2,7 @@ * */ -#ifndef __INTERNAL_HAL_IOAPIC_H -#define __INTERNAL_HAL_IOAPIC_H +#pragma once /* I/O APIC Register Address Map */ #define IOAPIC_IOREGSEL 0x0000 /* I/O Register Select (index) (R/W) */ @@ -95,9 +94,4 @@ VOID HaliReconfigurePciInterrupts(VOID); /* For debugging */ VOID IOAPICDump(VOID); -#endif - - - /* EOF */ - diff --git a/reactos/hal/halx86/include/mps.h b/reactos/hal/halx86/include/mps.h index 83f9cfbe501..ba766958280 100644 --- a/reactos/hal/halx86/include/mps.h +++ b/reactos/hal/halx86/include/mps.h @@ -1,5 +1,4 @@ -#ifndef __INCLUDE_HAL_MPS -#define __INCLUDE_HAL_MPS +#pragma once /* * FIXME: This does not work if we have more than 24 IRQs (ie. more than one @@ -198,7 +197,4 @@ typedef struct _MP_CONFIGURATION_INTLOCAL VOID HalpInitMPS(VOID); - -#endif /* __INCLUDE_HAL_MPS */ - /* EOF */ diff --git a/reactos/lib/atl/atlbase.h b/reactos/lib/atl/atlbase.h index 1cce7972ca6..137acf11b4b 100644 --- a/reactos/lib/atl/atlbase.h +++ b/reactos/lib/atl/atlbase.h @@ -18,8 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _atlbase_h -#define _atlbase_h +#pragma once #include "atlcore.h" #include "statreg.h" @@ -1004,5 +1003,3 @@ inline void *__stdcall AtlWinModuleExtractCreateWndData(_ATL_WIN_MODULE *pWinMod #ifndef _ATL_NO_AUTOMATIC_NAMESPACE using namespace ATL; #endif //!_ATL_NO_AUTOMATIC_NAMESPACE - -#endif // _atlbase_h diff --git a/reactos/lib/atl/atlcom.h b/reactos/lib/atl/atlcom.h index 04a4521c2e7..c86a67560b6 100644 --- a/reactos/lib/atl/atlcom.h +++ b/reactos/lib/atl/atlcom.h @@ -18,8 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _atlcom_h -#define _atlcom_h +#pragma once namespace ATL { @@ -1129,5 +1128,3 @@ public: offsetofclass(ATL::IConnectionPointContainerImpl<_atl_conn_classtype>, _atl_conn_classtype)}, }; // namespace ATL - -#endif // _atlcom_h diff --git a/reactos/lib/atl/atlcore.h b/reactos/lib/atl/atlcore.h index 55fcfe54526..c2f22eacfdf 100644 --- a/reactos/lib/atl/atlcore.h +++ b/reactos/lib/atl/atlcore.h @@ -18,8 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _atlcore_h -#define _atlcore_h +#pragma once #include #include @@ -202,5 +201,3 @@ public: extern CAtlBaseModule _AtlBaseModule; }; // namespace ATL - -#endif // _atlcore_h diff --git a/reactos/lib/atl/atlwin.h b/reactos/lib/atl/atlwin.h index c1a212bf2bc..de63eb0ac8f 100644 --- a/reactos/lib/atl/atlwin.h +++ b/reactos/lib/atl/atlwin.h @@ -18,8 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _atlin_h -#define _atlwin_h +#pragma once #ifdef __GNUC__ #define GCCU(x) x __attribute__((unused)) @@ -778,5 +777,3 @@ struct _ATL_WNDCLASSINFOW }; }; // namespace ATL - -#endif // _atlwin_h diff --git a/reactos/lib/atl/statreg.h b/reactos/lib/atl/statreg.h index e5e0553d583..2da4f2c8cf4 100644 --- a/reactos/lib/atl/statreg.h +++ b/reactos/lib/atl/statreg.h @@ -19,8 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _statreg_h -#define _statreg_h +#pragma once class IRegistrarBase : public IUnknown { @@ -675,5 +674,3 @@ private: }; }; //namespace ATL - -#endif // _statreg_h diff --git a/reactos/lib/cmlib/cmdata.h b/reactos/lib/cmlib/cmdata.h index b4a3df7af9d..61629c6398a 100644 --- a/reactos/lib/cmlib/cmdata.h +++ b/reactos/lib/cmlib/cmdata.h @@ -5,8 +5,7 @@ * Copyright 2001 - 2005 Eric Kohl */ -#ifndef CMLIB_CMDATA_H -#define CMLIB_CMDATA_H +#pragma once #define REG_INIT_BLOCK_LIST_SIZE 32 #define REG_INIT_HASH_TABLE_SIZE 3 @@ -209,5 +208,3 @@ typedef struct _CELL_DATA WCHAR KeyString[ANYSIZE_ARRAY]; } u; } CELL_DATA, *PCELL_DATA; - -#endif /* CMLIB_CMDATA_H */ diff --git a/reactos/lib/cmlib/cmlib.h b/reactos/lib/cmlib/cmlib.h index ca289e7451b..fae049507d2 100644 --- a/reactos/lib/cmlib/cmlib.h +++ b/reactos/lib/cmlib/cmlib.h @@ -5,8 +5,7 @@ * Copyright 2001 - 2005 Eric Kohl */ -#ifndef CMLIB_H -#define CMLIB_H +#pragma once // // Debug support switch @@ -307,5 +306,3 @@ HvpCreateHiveFreeCellList( ULONG CMAPI HvpHiveHeaderChecksum( PHBASE_BLOCK HiveHeader); - -#endif /* CMLIB_H */ diff --git a/reactos/lib/cmlib/hivedata.h b/reactos/lib/cmlib/hivedata.h index 3501a8a684b..7bd8845048d 100644 --- a/reactos/lib/cmlib/hivedata.h +++ b/reactos/lib/cmlib/hivedata.h @@ -5,8 +5,7 @@ * Copyright 2001 - 2005 Eric Kohl */ -#ifndef CMLIB_HIVEDATA_H -#define CMLIB_HIVEDATA_H +#pragma once // // Hive operations @@ -305,5 +304,3 @@ typedef struct _HHIVE #define IsFreeCell(Cell)(Cell->Size >= 0) #define IsUsedCell(Cell)(Cell->Size < 0) - -#endif /* CMLIB_HIVEDATA_H */ diff --git a/reactos/lib/dnslib/inc/dnslib.h b/reactos/lib/dnslib/inc/dnslib.h index 4c187f15b37..d9626e64125 100644 --- a/reactos/lib/dnslib/inc/dnslib.h +++ b/reactos/lib/dnslib/inc/dnslib.h @@ -4,8 +4,8 @@ * FILE: include/mswsock.h * PURPOSE: Ancillary Function Driver DLL header */ -#ifndef __DNSLIB_H -#define __DNSLIB_H + +#pragma once /* INCLUDES ******************************************************************/ #include @@ -339,5 +339,3 @@ Dns_Ip4ReverseNameToAddress_W( OUT PIN_ADDR Address, IN LPWSTR Name ); - -#endif diff --git a/reactos/lib/drivers/csq/csq.h b/reactos/lib/drivers/csq/csq.h index b08d02c27e0..990b6e3ff71 100644 --- a/reactos/lib/drivers/csq/csq.h +++ b/reactos/lib/drivers/csq/csq.h @@ -42,8 +42,7 @@ * source if you're curious about the inner workings of these routines. */ -#ifndef _REACTOS_CSQ_H -#define _REACTOS_CSQ_H +#pragma once /* * Prevent including the CSQ definitions twice. They're present in NTDDK @@ -285,5 +284,3 @@ PIRP NTAPI IoCsqRemoveIrp(PIO_CSQ Csq, */ PIRP NTAPI IoCsqRemoveNextIrp(PIO_CSQ Csq, PVOID PeekContext); - -#endif /* _REACTOS_CSQ_H */ diff --git a/reactos/lib/drivers/sound/mmixer/mmixer.h b/reactos/lib/drivers/sound/mmixer/mmixer.h index e14d663cd49..0cfc4acdc07 100644 --- a/reactos/lib/drivers/sound/mmixer/mmixer.h +++ b/reactos/lib/drivers/sound/mmixer/mmixer.h @@ -1,5 +1,4 @@ -#ifndef MIXER_H__ -#define MIXER_H__ +#pragma once typedef enum { @@ -197,5 +196,3 @@ MMixerGetWaveDevicePath( IN ULONG bWaveIn, IN ULONG DeviceId, OUT LPWSTR * DevicePath); - -#endif diff --git a/reactos/lib/drivers/sound/mmixer/priv.h b/reactos/lib/drivers/sound/mmixer/priv.h index 5b582d6fe94..2097294436a 100644 --- a/reactos/lib/drivers/sound/mmixer/priv.h +++ b/reactos/lib/drivers/sound/mmixer/priv.h @@ -1,5 +1,4 @@ -#ifndef PRIV_H__ -#define PRIV_H__ +#pragma once #include #include @@ -279,5 +278,3 @@ MIXER_STATUS MMixerAddEvents( IN PMIXER_CONTEXT MixerContext, IN OUT LPMIXER_INFO MixerInfo); - -#endif diff --git a/reactos/lib/fslib/ext2lib/Bitmap.h b/reactos/lib/fslib/ext2lib/Bitmap.h index cbac01c8ddd..a605a298896 100644 --- a/reactos/lib/fslib/ext2lib/Bitmap.h +++ b/reactos/lib/fslib/ext2lib/Bitmap.h @@ -1,12 +1,7 @@ -#ifndef _BITMAP_H +#pragma once #include "time.h" #include "stdio.h" #include "stdlib.h" #include "string.h" #include "windows.h" - - - - -#endif // _BITMAP_H diff --git a/reactos/lib/fslib/ext2lib/Disk.h b/reactos/lib/fslib/ext2lib/Disk.h index d23a14a4b33..da24bf39ea7 100644 --- a/reactos/lib/fslib/ext2lib/Disk.h +++ b/reactos/lib/fslib/ext2lib/Disk.h @@ -5,15 +5,10 @@ * HOMEPAGE: http://ext2.yeah.net */ -#ifndef _DISK_H_ -#define _DISK_H_ +#pragma once /* INCLUDES **************************************************************/ #include "Stdafx.h" /* DEFINITIONS ***********************************************************/ - - - -#endif /* _DISK_H_ */ diff --git a/reactos/lib/fslib/ext2lib/Mke2fs.h b/reactos/lib/fslib/ext2lib/Mke2fs.h index f8c3076e18f..4afba0dff8b 100644 --- a/reactos/lib/fslib/ext2lib/Mke2fs.h +++ b/reactos/lib/fslib/ext2lib/Mke2fs.h @@ -5,9 +5,7 @@ * HOMEPAGE: http://ext2.yeah.net */ -#ifndef __MKE2FS__INCLUDE__ -#define __MKE2FS__INCLUDE__ - +#pragma once /* INCLUDES **************************************************************/ @@ -406,5 +404,3 @@ ULONG ext2_unix_time (LONGLONG n_time); */ void uuid_generate(__u8 * uuid); - -#endif //__MKE2FS__INCLUDE__ diff --git a/reactos/lib/fslib/ext2lib/ext2_fs.h b/reactos/lib/fslib/ext2lib/ext2_fs.h index be4cafa5ae7..864551c8c0a 100644 --- a/reactos/lib/fslib/ext2lib/ext2_fs.h +++ b/reactos/lib/fslib/ext2lib/ext2_fs.h @@ -13,8 +13,7 @@ * Copyright f(C) 1991, 1992 Linus Torvalds */ -#ifndef _LINUX_EXT2_FS_H -#define _LINUX_EXT2_FS_H +#pragma once #include "types.h" /* Changed from linux/types.h */ @@ -653,5 +652,3 @@ extern struct inode_operations ext2_fast_symlink_inode_operations; extern struct address_space_operations ext2_aops; #endif /* __KERNEL__ */ - -#endif /* _LINUX_EXT2_FS_H */ diff --git a/reactos/lib/fslib/ext2lib/types.h b/reactos/lib/fslib/ext2lib/types.h index a874df5b564..c43fb13a970 100644 --- a/reactos/lib/fslib/ext2lib/types.h +++ b/reactos/lib/fslib/ext2lib/types.h @@ -1,10 +1,7 @@ -#ifndef _LINUX_TYPES_H -#define _LINUX_TYPES_H +#pragma once typedef unsigned long __u32; typedef signed long __s32; typedef unsigned short int __u16; typedef signed short int __s16; typedef unsigned char __u8; - -#endif /* LINUX_TYPES_H */ diff --git a/reactos/lib/inflib/infcommon.h b/reactos/lib/inflib/infcommon.h index 8504ab34895..a80f2029078 100644 --- a/reactos/lib/inflib/infcommon.h +++ b/reactos/lib/inflib/infcommon.h @@ -6,14 +6,11 @@ * Ge van Geldorp */ -#ifndef INFCOMMON_H_INCLUDED -#define INFCOMMON_H_INCLUDED +#pragma once #define MAX_INF_STRING_LENGTH 512 typedef void *HINF, **PHINF; typedef struct _INFCONTEXT *PINFCONTEXT; -#endif /* INFCOMMON_H_INCLUDED */ - /* EOF */ diff --git a/reactos/lib/inflib/infhost.h b/reactos/lib/inflib/infhost.h index 3e17e7f4e46..1a40990160f 100644 --- a/reactos/lib/inflib/infhost.h +++ b/reactos/lib/inflib/infhost.h @@ -6,8 +6,7 @@ * Ge van Geldorp */ -#ifndef INFHOST_H_INCLUDED -#define INFHOST_H_INCLUDED +#pragma once #ifdef __cplusplus extern "C" { @@ -76,6 +75,4 @@ extern void InfHostFreeContext(PINFCONTEXT Context); } #endif /* __cplusplus */ -#endif /* INFROS_H_INCLUDED */ - /* EOF */ diff --git a/reactos/lib/inflib/infpriv.h b/reactos/lib/inflib/infpriv.h index 479651513c7..0dd7d88bba6 100644 --- a/reactos/lib/inflib/infpriv.h +++ b/reactos/lib/inflib/infpriv.h @@ -6,8 +6,7 @@ * Ge van Geldorp */ -#ifndef INFPRIV_H_INCLUDED -#define INFPRIV_H_INCLUDED +#pragma once #ifndef FIELD_OFFSET #define FIELD_OFFSET(t,f) ((ptrdiff_t)&(((t*)0)->f)) @@ -142,6 +141,4 @@ extern INFSTATUS InfpAddField(PINFCONTEXT Context, PCTSTR Data); extern VOID InfpFreeContext(PINFCONTEXT Context); -#endif /* INFPRIV_H_INCLUDED */ - /* EOF */ diff --git a/reactos/lib/inflib/infros.h b/reactos/lib/inflib/infros.h index e959a72a9e7..7de69673996 100644 --- a/reactos/lib/inflib/infros.h +++ b/reactos/lib/inflib/infros.h @@ -6,8 +6,7 @@ * Ge van Geldorp */ -#ifndef INFROS_H_INCLUDED -#define INFROS_H_INCLUDED +#pragma once #ifdef __cplusplus extern "C" { @@ -77,6 +76,4 @@ extern VOID InfFreeContext(PINFCONTEXT Context); } #endif /* __cplusplus */ -#endif /* INFROS_H_INCLUDED */ - /* EOF */ diff --git a/reactos/lib/nls/scripts/scripts.h b/reactos/lib/nls/scripts/scripts.h index 8bf8083d402..1911e5f001e 100644 --- a/reactos/lib/nls/scripts/scripts.h +++ b/reactos/lib/nls/scripts/scripts.h @@ -30,8 +30,7 @@ * */ -#ifndef REACTOS_SCRIPTS_H_ -#define REACTOS_SCRIPTS_H_ +#pragma once #include #include @@ -69,6 +68,4 @@ extern "C" bool SCRIPTS_GetCharScriptCode(UChar32 c, int32_t * code); extern "C" bool SCRIPTS_GetScriptCode(const SCRIPTS_Script * pScript, int32_t * code); extern "C" void SCRIPTS_GetScriptName(int32_t code, SCRIPTS_Script * pScript); -#endif - /* EOF */ diff --git a/reactos/lib/ppcmmu/mmuobject.h b/reactos/lib/ppcmmu/mmuobject.h index 9689746ff0a..024f757e38a 100644 --- a/reactos/lib/ppcmmu/mmuobject.h +++ b/reactos/lib/ppcmmu/mmuobject.h @@ -1,5 +1,4 @@ -#ifndef _LIBMMU_MMUOBJECT_H -#define _LIBMMU_MMUOBJECT_H +#pragma once void initme(); void mmusetramsize(paddr_t size); @@ -13,5 +12,3 @@ void freevsid(int); void mmufreevsid(int vsid, int mask); int mmunitest(); void callkernel(void *fun_ptr, void *arg); - -#endif/*_LIBMMU_MMUOBJECT_H*/ diff --git a/reactos/lib/recyclebin/recyclebin.h b/reactos/lib/recyclebin/recyclebin.h index a1f64e9373b..b822f1d3ceb 100644 --- a/reactos/lib/recyclebin/recyclebin.h +++ b/reactos/lib/recyclebin/recyclebin.h @@ -1,5 +1,4 @@ -#ifndef __RECYCLEBIN_H -#define __RECYCLEBIN_H +#pragma once #ifdef __cplusplus extern "C" { @@ -297,5 +296,3 @@ GetDefaultRecycleBin( #ifdef __cplusplus } #endif - -#endif /* __RECYCLEBIN_H */ diff --git a/reactos/lib/rossym/rossympriv.h b/reactos/lib/rossym/rossympriv.h index abccd297128..cc3f8ff2ff9 100644 --- a/reactos/lib/rossym/rossympriv.h +++ b/reactos/lib/rossym/rossympriv.h @@ -7,8 +7,7 @@ * PROGRAMMERS: Ge van Geldorp (gvg@reactos.com) */ -#ifndef ROSSYMPRIV_H_INCLUDED -#define ROSSYMPRIV_H_INCLUDED +#pragma once typedef struct _ROSSYM_INFO { PROSSYM_ENTRY Symbols; @@ -32,8 +31,4 @@ extern BOOLEAN RosSymZwSeekFile(PVOID FileContext, ULONG_PTR Position); #define ROSSYM_IS_VALID_NT_HEADERS(NtHeaders) (IMAGE_NT_SIGNATURE == (NtHeaders)->Signature \ && IMAGE_NT_OPTIONAL_HDR_MAGIC == (NtHeaders)->OptionalHeader.Magic) - -#endif /* ROSSYMPRIV_H_INCLUDED */ - /* EOF */ - diff --git a/reactos/lib/rtl/austin/avl.h b/reactos/lib/rtl/austin/avl.h index 9a020635c11..575fb44f2e1 100644 --- a/reactos/lib/rtl/austin/avl.h +++ b/reactos/lib/rtl/austin/avl.h @@ -6,8 +6,7 @@ * PROGRAMMER: arty */ -#ifndef _REACTOS_RTL_LIB_AUSTIN_AVL_H -#define _REACTOS_RTL_LIB_AUSTIN_AVL_H +#pragma once #define avl_data(x) ((void*)(&(x)[1])) @@ -25,6 +24,3 @@ int avl_search PVOID _key, PRTL_BALANCED_LINKS node, PRTL_BALANCED_LINKS *where); - - -#endif/*_REACTOS_RTL_LIB_AUSTIN_AVL_H*/ diff --git a/reactos/lib/rtl/austin/udict.h b/reactos/lib/rtl/austin/udict.h index b80e9083ae8..47bb56fb704 100644 --- a/reactos/lib/rtl/austin/udict.h +++ b/reactos/lib/rtl/austin/udict.h @@ -21,8 +21,7 @@ * Modified for use in ReactOS by arty */ -#ifndef UDICT_H -#define UDICT_H +#pragma once #include @@ -122,5 +121,3 @@ udict_node_t *udict_first(udict_t *); udict_node_t *udict_last(udict_t *); udict_node_t *udict_next(udict_t *, udict_node_t *); udict_node_t *udict_prev(udict_t *, udict_node_t *); - -#endif diff --git a/reactos/lib/tdilib/tdilib.h b/reactos/lib/tdilib/tdilib.h index 32231384f69..1cd367d1a37 100644 --- a/reactos/lib/tdilib/tdilib.h +++ b/reactos/lib/tdilib/tdilib.h @@ -5,8 +5,8 @@ * PURPOSE: Shared TDI library header */ -#ifndef TDILIB_H -#define TDILIB_H +#pragma once + NTSTATUS openTcpFile(PHANDLE tcpFile); VOID closeTcpFile(HANDLE tcpFile); NTSTATUS tdiGetEntityIDSet( HANDLE tcpFile, TDIEntityID **entitySet, @@ -17,4 +17,3 @@ NTSTATUS tdiGetSetOfThings( HANDLE tcpFile, DWORD toiClass, DWORD toiType, DWORD entrySize, PVOID *tdiEntitySet, PDWORD numEntries ); VOID tdiFreeThingSet( PVOID things ); -#endif diff --git a/reactos/ntoskrnl/include/config.h b/reactos/ntoskrnl/include/config.h index 656080f7a4b..7e925ef419a 100644 --- a/reactos/ntoskrnl/include/config.h +++ b/reactos/ntoskrnl/include/config.h @@ -1,5 +1,4 @@ -#ifndef __INCLUDE_NTOSKRNL_CONFIG_H -#define __INCLUDE_NTOSKRNL_CONFIG_H +#pragma once /********** dbg/print.c **********/ @@ -39,6 +38,3 @@ */ #undef WHOLE_PAGE_ALLOCATIONS #endif - -#endif /* __INCLUDE_NTOSKRNL_CONFIG_H */ - diff --git a/reactos/ntoskrnl/include/internal/arch/intrin_i.h b/reactos/ntoskrnl/include/internal/arch/intrin_i.h index b0025ab955d..f8ce285678c 100644 --- a/reactos/ntoskrnl/include/internal/arch/intrin_i.h +++ b/reactos/ntoskrnl/include/internal/arch/intrin_i.h @@ -16,8 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARCH_INTRIN_I_H -#define __NTOSKRNL_INCLUDE_INTERNAL_ARCH_INTRIN_I_H + +#pragma once #ifdef _M_IX86 #include "../i386/intrin_i.h" @@ -31,6 +31,4 @@ #error "Unknown processor" #endif -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_ARCH_INTRIN_I_H */ - /* EOF */ diff --git a/reactos/ntoskrnl/include/internal/arch/ke.h b/reactos/ntoskrnl/include/internal/arch/ke.h index beed389a76d..ef8a27bd951 100644 --- a/reactos/ntoskrnl/include/internal/arch/ke.h +++ b/reactos/ntoskrnl/include/internal/arch/ke.h @@ -16,8 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARCH_KE_H -#define __NTOSKRNL_INCLUDE_INTERNAL_ARCH_KE_H + +#pragma once #ifdef _M_IX86 #include "../i386/ke.h" @@ -31,6 +31,4 @@ #error "Unknown processor" #endif -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_ARCH_KE_H */ - /* EOF */ diff --git a/reactos/ntoskrnl/include/internal/arch/mm.h b/reactos/ntoskrnl/include/internal/arch/mm.h index f86e6f22d9f..a2a97919259 100644 --- a/reactos/ntoskrnl/include/internal/arch/mm.h +++ b/reactos/ntoskrnl/include/internal/arch/mm.h @@ -16,8 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARCH_MM_H -#define __NTOSKRNL_INCLUDE_INTERNAL_ARCH_MM_H + +#pragma once #ifdef _M_IX86 #include @@ -30,5 +30,3 @@ #else #error "Unknown processor" #endif - -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_ARCH_MM_H */ diff --git a/reactos/ntoskrnl/include/internal/arm/intrin_i.h b/reactos/ntoskrnl/include/internal/arm/intrin_i.h index 286a1f6a355..fdd4b88660d 100644 --- a/reactos/ntoskrnl/include/internal/arm/intrin_i.h +++ b/reactos/ntoskrnl/include/internal/arm/intrin_i.h @@ -1,5 +1,4 @@ -#ifndef _INTRIN_INTERNAL_ -#define _INTRIN_INTERNAL_ +#pragma once FORCEINLINE VOID @@ -154,5 +153,3 @@ KeArmWaitForInterrupt(VOID) { __asm__ __volatile__ ("mcr p15, 0, %0, c7, c0, 4" : : "r"(0) : "cc"); } - -#endif diff --git a/reactos/ntoskrnl/include/internal/arm/ke.h b/reactos/ntoskrnl/include/internal/arm/ke.h index e8bdaf5db1b..80fee0a7e19 100644 --- a/reactos/ntoskrnl/include/internal/arm/ke.h +++ b/reactos/ntoskrnl/include/internal/arm/ke.h @@ -1,5 +1,4 @@ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARM_KE_H -#define __NTOSKRNL_INCLUDE_INTERNAL_ARM_KE_H +#pragma once #include "intrin_i.h" @@ -117,5 +116,3 @@ KeFlushTb( #define KiGetPreviousMode(tf) \ ((tf->Spsr & CPSR_MODES) == CPSR_USER_MODE) ? UserMode: KernelMode - -#endif diff --git a/reactos/ntoskrnl/include/internal/arm/mm.h b/reactos/ntoskrnl/include/internal/arm/mm.h index 68eb3262250..67eae35e1a5 100644 --- a/reactos/ntoskrnl/include/internal/arm/mm.h +++ b/reactos/ntoskrnl/include/internal/arm/mm.h @@ -1,5 +1,4 @@ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARM_MM_H -#define __NTOSKRNL_INCLUDE_INTERNAL_ARM_MM_H +#pragma once // // Number of bits corresponding to the area that a PDE entry represents (1MB) @@ -157,5 +156,3 @@ PULONG MmGetPageDirectory(VOID); ((((x)) % (4*1024*1024)) / (4*1024)) #define MM_CACHE_LINE_SIZE 64 - -#endif diff --git a/reactos/ntoskrnl/include/internal/cc.h b/reactos/ntoskrnl/include/internal/cc.h index 62221cb2ed8..30139ec6766 100644 --- a/reactos/ntoskrnl/include/internal/cc.h +++ b/reactos/ntoskrnl/include/internal/cc.h @@ -1,5 +1,4 @@ -#ifndef __INCLUDE_INTERNAL_CC_H -#define __INCLUDE_INTERNAL_CC_H +#pragma once typedef struct _PF_SCENARIO_ID { @@ -315,5 +314,3 @@ CcRosReleaseFileCache( NTSTATUS NTAPI CcTryToInitializeFileCache(PFILE_OBJECT FileObject); - -#endif diff --git a/reactos/ntoskrnl/include/internal/ex.h b/reactos/ntoskrnl/include/internal/ex.h index 3c8803b3674..a8bf90d70fa 100644 --- a/reactos/ntoskrnl/include/internal/ex.h +++ b/reactos/ntoskrnl/include/internal/ex.h @@ -1,5 +1,4 @@ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_EXECUTIVE_H -#define __NTOSKRNL_INCLUDE_INTERNAL_EXECUTIVE_H +#pragma once /* GLOBAL VARIABLES *********************************************************/ @@ -1410,5 +1409,3 @@ XIPInit( #define ExfInterlockedCompareExchange64UL(Destination, Exchange, Comperand) \ (ULONGLONG)ExfInterlockedCompareExchange64((PLONGLONG)(Destination), (PLONGLONG)(Exchange), (PLONGLONG)(Comperand)) - -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_EXECUTIVE_H */ diff --git a/reactos/ntoskrnl/include/internal/hal.h b/reactos/ntoskrnl/include/internal/hal.h index 32638d25e93..9c0c77ffa65 100644 --- a/reactos/ntoskrnl/include/internal/hal.h +++ b/reactos/ntoskrnl/include/internal/hal.h @@ -5,8 +5,8 @@ * PURPOSE: Internal header for the I/O HAL Functions (Fstub) * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) */ -#ifndef _HAL_ -#define _HAL_ + +#pragma once // // Default implementations of HAL dispatch table @@ -156,5 +156,3 @@ typedef struct _PTE ULONG StartingSector; ULONG PartitionLength; } PTE, *PPTE; - -#endif diff --git a/reactos/ntoskrnl/include/internal/i386/intrin_i.h b/reactos/ntoskrnl/include/internal/i386/intrin_i.h index 7414dfb7191..a78497b1871 100644 --- a/reactos/ntoskrnl/include/internal/i386/intrin_i.h +++ b/reactos/ntoskrnl/include/internal/i386/intrin_i.h @@ -1,5 +1,4 @@ -#ifndef _INTRIN_INTERNAL_ -#define _INTRIN_INTERNAL_ +#pragma once #if defined(__GNUC__) @@ -263,6 +262,4 @@ Ke386SetGs(IN USHORT Value) #error Unknown compiler for inline assembler #endif -#endif - /* EOF */ diff --git a/reactos/ntoskrnl/include/internal/i386/ke.h b/reactos/ntoskrnl/include/internal/i386/ke.h index 62cc481627e..ebe474890ea 100644 --- a/reactos/ntoskrnl/include/internal/i386/ke.h +++ b/reactos/ntoskrnl/include/internal/i386/ke.h @@ -1,5 +1,4 @@ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H -#define __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H +#pragma once #ifndef __ASM__ @@ -775,4 +774,3 @@ Ki386PerfEnd(VOID) } #endif -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H */ diff --git a/reactos/ntoskrnl/include/internal/i386/mm.h b/reactos/ntoskrnl/include/internal/i386/mm.h index 143a43e7cd1..7e768bbde1c 100644 --- a/reactos/ntoskrnl/include/internal/i386/mm.h +++ b/reactos/ntoskrnl/include/internal/i386/mm.h @@ -2,8 +2,7 @@ * Lowlevel memory managment definitions */ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H -#define __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H +#pragma once struct _EPROCESS; PULONG MmGetPageDirectory(VOID); @@ -86,5 +85,3 @@ PULONG MmGetPageDirectory(VOID); * FIXME - different architectures have different cache line sizes... */ #define MM_CACHE_LINE_SIZE 32 - -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H */ diff --git a/reactos/ntoskrnl/include/internal/i386/v86m.h b/reactos/ntoskrnl/include/internal/i386/v86m.h index dcbaf7e2f8a..167bb7c97cd 100644 --- a/reactos/ntoskrnl/include/internal/i386/v86m.h +++ b/reactos/ntoskrnl/include/internal/i386/v86m.h @@ -1,5 +1,4 @@ -#ifndef __V86M_ -#define __V86M_ +#pragma once #include "ketypes.h" @@ -57,5 +56,3 @@ typedef struct _KV86M_TRAP_FRAME struct _KV86M_REGISTERS* regs; ULONG orig_ebp; } KV86M_TRAP_FRAME, *PKV86M_TRAP_FRAME; - -#endif diff --git a/reactos/ntoskrnl/include/internal/inbv.h b/reactos/ntoskrnl/include/internal/inbv.h index 00fd9a18e41..bc7ee504efa 100644 --- a/reactos/ntoskrnl/include/internal/inbv.h +++ b/reactos/ntoskrnl/include/internal/inbv.h @@ -1,5 +1,4 @@ -#ifndef NTOSKRNL_INBV_H -#define NTOSKRNL_INBV_H +#pragma once typedef struct _InbvProgressState { @@ -46,7 +45,3 @@ FinalizeBootLogo( ); extern BOOLEAN InbvBootDriverInstalled; - -#endif /* NTOSKRNL_INBV_H */ - - diff --git a/reactos/ntoskrnl/include/internal/kd.h b/reactos/ntoskrnl/include/internal/kd.h index 151b1800643..b61d498b771 100644 --- a/reactos/ntoskrnl/include/internal/kd.h +++ b/reactos/ntoskrnl/include/internal/kd.h @@ -1,5 +1,4 @@ -#ifndef __INCLUDE_INTERNAL_KERNEL_DEBUGGER_H -#define __INCLUDE_INTERNAL_KERNEL_DEBUGGER_H +#pragma once #ifdef _M_PPC #define KdDebuggerEnabled _KdDebuggerEnabled @@ -364,4 +363,3 @@ extern KD_CONTEXT KdpContext; extern ULONG Kd_WIN2000_Mask; #endif -#endif /* __INCLUDE_INTERNAL_KERNEL_DEBUGGER_H */ diff --git a/reactos/ntoskrnl/include/internal/ke.h b/reactos/ntoskrnl/include/internal/ke.h index fd1ccdb6b9f..b1752aff4da 100644 --- a/reactos/ntoskrnl/include/internal/ke.h +++ b/reactos/ntoskrnl/include/internal/ke.h @@ -1,5 +1,4 @@ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_KE_H -#define __NTOSKRNL_INCLUDE_INTERNAL_KE_H +#pragma once /* INCLUDES *****************************************************************/ @@ -1102,5 +1101,3 @@ KiSystemFatalException( ); #include "ke_x.h" - -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_KE_H */ diff --git a/reactos/ntoskrnl/include/internal/ldr.h b/reactos/ntoskrnl/include/internal/ldr.h index 98988135237..77eb7fdc32b 100644 --- a/reactos/ntoskrnl/include/internal/ldr.h +++ b/reactos/ntoskrnl/include/internal/ldr.h @@ -1,9 +1,6 @@ -#ifndef __INCLUDE_INTERNAL_LDR_H -#define __INCLUDE_INTERNAL_LDR_H +#pragma once #define KERNEL_MODULE_NAME L"ntoskrnl.exe" #define HAL_MODULE_NAME L"hal.dll" #define DRIVER_ROOT_NAME L"\\Driver\\" #define FILESYSTEM_ROOT_NAME L"\\FileSystem\\" - -#endif /* __INCLUDE_INTERNAL_LDR_H */ diff --git a/reactos/ntoskrnl/include/internal/mm.h b/reactos/ntoskrnl/include/internal/mm.h index c67b0870ea9..db7003d1438 100644 --- a/reactos/ntoskrnl/include/internal/mm.h +++ b/reactos/ntoskrnl/include/internal/mm.h @@ -1,5 +1,4 @@ -#ifndef __INCLUDE_INTERNAL_MM_H -#define __INCLUDE_INTERNAL_MM_H +#pragma once #include @@ -1743,5 +1742,3 @@ MmGetKernelAddressSpace(VOID) { return MmKernelAddressSpace; } - -#endif diff --git a/reactos/ntoskrnl/include/internal/ntoskrnl.h b/reactos/ntoskrnl/include/internal/ntoskrnl.h index 0823f1d229a..8a2cac31df8 100644 --- a/reactos/ntoskrnl/include/internal/ntoskrnl.h +++ b/reactos/ntoskrnl/include/internal/ntoskrnl.h @@ -1,5 +1,4 @@ -#ifndef __INCLUDE_INTERNAL_NTOSKRNL_H -#define __INCLUDE_INTERNAL_NTOSKRNL_H +#pragma once /* * Use these to place a function in a specific section of the executable @@ -198,5 +197,3 @@ C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP); C_ASSERT(FIELD_OFFSET(KTSS, Esp0) == KTSS_ESP0); C_ASSERT(FIELD_OFFSET(KTSS, IoMapBase) == KTSS_IOMAPBASE); #endif - -#endif /* INCLUDE_INTERNAL_NTOSKRNL_H */ diff --git a/reactos/ntoskrnl/include/internal/pci.h b/reactos/ntoskrnl/include/internal/pci.h index 135895f0a8a..cba5dc57725 100644 --- a/reactos/ntoskrnl/include/internal/pci.h +++ b/reactos/ntoskrnl/include/internal/pci.h @@ -5,8 +5,8 @@ * PURPOSE: Internal header for PCI Support * PROGRAMMERS: Alex Ionescu (alex.ionescu@reactos.org) */ -#ifndef _PCI_ -#define _PCI_ + +#pragma once // // PCI Type 1 Ports @@ -103,5 +103,3 @@ typedef struct _PCI_CARD_DESCRIPTOR USHORT SubsystemID; USHORT Reserved; } PCI_CARD_DESCRIPTOR, *PPCI_CARD_DESCRIPTOR; - -#endif diff --git a/reactos/ntoskrnl/include/internal/powerpc/intrin_i.h b/reactos/ntoskrnl/include/internal/powerpc/intrin_i.h index 025cf21f67e..daf84cf26ea 100644 --- a/reactos/ntoskrnl/include/internal/powerpc/intrin_i.h +++ b/reactos/ntoskrnl/include/internal/powerpc/intrin_i.h @@ -1,8 +1,5 @@ -#ifndef _INTRIN_INTERNAL_ -#define _INTRIN_INTERNAL_ +#pragma once #define Ke386SaveFlags(x) __asm__ __volatile__("mfmsr %0" : "=r" (x) :) -#endif - /* EOF */ diff --git a/reactos/ntoskrnl/include/internal/powerpc/ke.h b/reactos/ntoskrnl/include/internal/powerpc/ke.h index ba47ffcbf02..87f48fde67a 100644 --- a/reactos/ntoskrnl/include/internal/powerpc/ke.h +++ b/reactos/ntoskrnl/include/internal/powerpc/ke.h @@ -16,8 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_POWERPC_KE_H -#define __NTOSKRNL_INCLUDE_INTERNAL_POWERPC_KE_H + +#pragma once #include @@ -112,6 +112,4 @@ KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine, #endif /* __ASM__ */ -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_POWERPC_KE_H */ - /* EOF */ diff --git a/reactos/ntoskrnl/include/internal/probe.h b/reactos/ntoskrnl/include/internal/probe.h index 4956e047888..f02af658779 100644 --- a/reactos/ntoskrnl/include/internal/probe.h +++ b/reactos/ntoskrnl/include/internal/probe.h @@ -1,5 +1,4 @@ -#ifndef __INCLUDE_INTERNAL_PROBE_H -#define __INCLUDE_INTERNAL_PROBE_H +#pragma once #include @@ -118,5 +117,3 @@ DefaultQueryInfoBufferCheck(ULONG Class, return Status; } - -#endif diff --git a/reactos/ntoskrnl/include/internal/rtl.h b/reactos/ntoskrnl/include/internal/rtl.h index 4ea3bd9365a..18489044fc9 100644 --- a/reactos/ntoskrnl/include/internal/rtl.h +++ b/reactos/ntoskrnl/include/internal/rtl.h @@ -1,5 +1,4 @@ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_NLS_H -#define __NTOSKRNL_INCLUDE_INTERNAL_NLS_H +#pragma once NTSTATUS NTAPI @@ -16,6 +15,4 @@ RtlInitializeRangeListPackage( VOID ); -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_NLS_H */ - /* EOF */ diff --git a/reactos/ntoskrnl/include/internal/se.h b/reactos/ntoskrnl/include/internal/se.h index 3ea68e562f7..034a55591a0 100644 --- a/reactos/ntoskrnl/include/internal/se.h +++ b/reactos/ntoskrnl/include/internal/se.h @@ -1,5 +1,4 @@ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_SE_H -#define __NTOSKRNL_INCLUDE_INTERNAL_SE_H +#pragma once extern POBJECT_TYPE SepTokenObjectType; @@ -350,6 +349,4 @@ VOID NTAPI SeSetSecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, OUT PACCESS_MASK DesiredAccess); -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_SE_H */ - /* EOF */ diff --git a/reactos/ntoskrnl/include/internal/tag.h b/reactos/ntoskrnl/include/internal/tag.h index 8a23c7f2430..244665c2c99 100644 --- a/reactos/ntoskrnl/include/internal/tag.h +++ b/reactos/ntoskrnl/include/internal/tag.h @@ -1,5 +1,4 @@ -#ifndef _NTOSKRNL_TAG_H -#define _NTOSKRNL_TAG_H +#pragma once /* formerly located in cc/view.c */ #define TAG_CSEG 'GESC' @@ -163,5 +162,3 @@ #define TAG_WAIT 'tiaW' #define TAG_SEC_QUERY 'qSbO' - -#endif /* _NTOSKRNL_TAG_H */ diff --git a/reactos/ntoskrnl/include/internal/test.h b/reactos/ntoskrnl/include/internal/test.h index 5576a1ddd52..34e0b77166b 100644 --- a/reactos/ntoskrnl/include/internal/test.h +++ b/reactos/ntoskrnl/include/internal/test.h @@ -1,5 +1,4 @@ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_TEST_H -#define __NTOSKRNL_INCLUDE_INTERNAL_TEST_H +#pragma once typedef VOID NTAPI @@ -35,5 +34,3 @@ PObReferenceObjectByHandle( PVOID* Object, POBJECT_HANDLE_INFORMATION HandleInformation ); - -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_TEST_H */ diff --git a/reactos/ntoskrnl/include/internal/trap_x.h b/reactos/ntoskrnl/include/internal/trap_x.h index d1f9420d258..69ccde543f5 100644 --- a/reactos/ntoskrnl/include/internal/trap_x.h +++ b/reactos/ntoskrnl/include/internal/trap_x.h @@ -5,8 +5,8 @@ * PURPOSE: Internal Inlined Functions for the Trap Handling Code * PROGRAMMERS: ReactOS Portable Systems Group */ -#ifndef _TRAP_X_ -#define _TRAP_X_ + +#pragma once // // Unreachable code hint for GCC 4.5.x, older GCC versions, and MSVC @@ -613,5 +613,3 @@ KiEnterTrap(IN PKTRAP_FRAME TrapFrame) /* Set debug header */ KiFillTrapFrameDebug(TrapFrame); } - -#endif diff --git a/reactos/ntoskrnl/kdbg/i386/dis-asm.h b/reactos/ntoskrnl/kdbg/i386/dis-asm.h index 4052910d451..9d16c79d8a1 100644 --- a/reactos/ntoskrnl/kdbg/i386/dis-asm.h +++ b/reactos/ntoskrnl/kdbg/i386/dis-asm.h @@ -23,8 +23,7 @@ interface, for making instruction-processing programs more independent of the instruction set being processed. */ -#ifndef DIS_ASM_H -#define DIS_ASM_H +#pragma once #ifdef __cplusplus extern "C" { @@ -326,5 +325,3 @@ extern int generic_symbol_at_address #ifdef __cplusplus } #endif - -#endif /* ! defined (DIS_ASM_H) */ diff --git a/reactos/ntoskrnl/kdbg/kdb.h b/reactos/ntoskrnl/kdbg/kdb.h index 32785a5c26f..d77cdb0aa88 100644 --- a/reactos/ntoskrnl/kdbg/kdb.h +++ b/reactos/ntoskrnl/kdbg/kdb.h @@ -1,5 +1,4 @@ -#ifndef NTOSKRNL_KDB_H -#define NTOSKRNL_KDB_H +#pragma once /* DEFINES *******************************************************************/ @@ -264,6 +263,3 @@ VOID KbdDisableMouse(); VOID KbdEnableMouse(); - -#endif /* NTOSKRNL_KDB_H */ - diff --git a/reactos/subsystems/csr/csrsrv/srv.h b/reactos/subsystems/csr/csrsrv/srv.h index 1ddfac2194d..8c55942630f 100644 --- a/reactos/subsystems/csr/csrsrv/srv.h +++ b/reactos/subsystems/csr/csrsrv/srv.h @@ -1,5 +1,4 @@ -#ifndef _CSRSRV_H -#define _CSRSRV_H +#pragma once /* PSDK/NDK Headers */ #define NTOS_MODE_USER @@ -364,5 +363,3 @@ CsrThreadRefcountZero(IN PCSR_THREAD CsrThread); NTSTATUS NTAPI CsrSetDirectorySecurity(IN HANDLE ObjectDirectory); - -#endif diff --git a/reactos/subsystems/win/basesrv/basesrv.h b/reactos/subsystems/win/basesrv/basesrv.h index 20b17d02a8a..fe5cdb98ba5 100644 --- a/reactos/subsystems/win/basesrv/basesrv.h +++ b/reactos/subsystems/win/basesrv/basesrv.h @@ -1,5 +1,4 @@ -#ifndef _BASESRV_H_INCLUDED_ -#define _BASESRV_H_INCLUDED_ +#pragma once /* PSDK/NDK Headers */ #include @@ -10,5 +9,3 @@ #include #include - -#endif /* ndef _BASESRV_H_INCLUDED_ */ diff --git a/reactos/subsystems/win/winsrv/winsrv.h b/reactos/subsystems/win/winsrv/winsrv.h index 7d475ecf1a9..53d9f8d5583 100644 --- a/reactos/subsystems/win/winsrv/winsrv.h +++ b/reactos/subsystems/win/winsrv/winsrv.h @@ -1,5 +1,4 @@ -#ifndef _WINSRV_H_INCLUDED_ -#define _WINSRV_H_INCLUDED_ +#pragma once /* PSDK/NDK Headers */ #include @@ -11,5 +10,3 @@ #include #include #include - -#endif /* ndef _WINSRV_H_INCLUDED_ */ diff --git a/reactos/subsystems/win32/csrss/include/api.h b/reactos/subsystems/win32/csrss/include/api.h index 6e87fba96d2..aaec4ef8d5f 100644 --- a/reactos/subsystems/win32/csrss/include/api.h +++ b/reactos/subsystems/win32/csrss/include/api.h @@ -6,8 +6,7 @@ * PURPOSE: CSRSS API interface */ -#ifndef API_H_INCLUDED -#define API_H_INCLUDED +#pragma once #define NTOS_MODE_USER #include @@ -157,8 +156,4 @@ CSR_API(CsrSetShutdownParameters); CSR_API(CsrSetLogonNotifyWindow); CSR_API(CsrRegisterLogonProcess); - -#endif /* ndef API_H_INCLUDED */ - /* EOF */ - diff --git a/reactos/subsystems/win32/csrss/include/conio.h b/reactos/subsystems/win32/csrss/include/conio.h index fa6320f8e00..35d71863a15 100644 --- a/reactos/subsystems/win32/csrss/include/conio.h +++ b/reactos/subsystems/win32/csrss/include/conio.h @@ -6,8 +6,7 @@ * PURPOSE: CSRSS internal console I/O interface */ -#ifndef CONIO_H_INCLUDED -#define CONIO_H_INCLUDED +#pragma once #include "api.h" #include "win32csr.h" @@ -176,8 +175,4 @@ CSR_API(CsrGetAllConsoleAliasesLength); CSR_API(CsrGetConsoleAliasesExes); CSR_API(CsrGetConsoleAliasesExesLength); - -#endif /* CONIO_H_INCLUDED */ - /* EOF */ - diff --git a/reactos/subsystems/win32/csrss/include/csrplugin.h b/reactos/subsystems/win32/csrss/include/csrplugin.h index 90e158f6242..357b65bcd25 100644 --- a/reactos/subsystems/win32/csrss/include/csrplugin.h +++ b/reactos/subsystems/win32/csrss/include/csrplugin.h @@ -16,8 +16,7 @@ * subsystem. */ -#ifndef CSRPLUGIN_H_INCLUDED -#define CSRPLUGIN_H_INCLUDED +#pragma once #include #include "api.h" @@ -58,6 +57,4 @@ typedef BOOL (WINAPI *CSRPLUGIN_INITIALIZE_PROC)(PCSRSS_API_DEFINITION *ApiDefin PCSRSS_EXPORTED_FUNCS Exports, HANDLE CsrssApiHeap); -#endif /* CSRPLUGIN_H_INCLUDED */ - /* EOF */ diff --git a/reactos/subsystems/win32/csrss/include/desktopbg.h b/reactos/subsystems/win32/csrss/include/desktopbg.h index b06a16c95f3..737c2d12586 100644 --- a/reactos/subsystems/win32/csrss/include/desktopbg.h +++ b/reactos/subsystems/win32/csrss/include/desktopbg.h @@ -6,8 +6,7 @@ * PURPOSE: CSRSS internal desktop background window interface */ -#ifndef DESKTOPBG_H_INCLUDED -#define DESKTOPBG_H_INCLUDED +#pragma once #include "api.h" @@ -19,7 +18,4 @@ CSR_API(CsrRegisterSystemClasses); BOOL FASTCALL DtbgIsDesktopVisible(VOID); -#endif /* DESKTOPBG_H_INCLUDED */ - /* EOF */ - diff --git a/reactos/subsystems/win32/csrss/include/win32csr.h b/reactos/subsystems/win32/csrss/include/win32csr.h index dae70937ce3..6b7791f72f6 100644 --- a/reactos/subsystems/win32/csrss/include/win32csr.h +++ b/reactos/subsystems/win32/csrss/include/win32csr.h @@ -6,9 +6,7 @@ * PURPOSE: Interface to win32csr.dll */ - -#ifndef WIN32CSR_H_INCLUDED -#define WIN32CSR_H_INCLUDED +#pragma once #include #include @@ -38,6 +36,4 @@ NTSTATUS FASTCALL Win32CsrReleaseObject(PCSRSS_PROCESS_DATA ProcessData, NTSTATUS FASTCALL Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context); -#endif /* WIN32CSR_H_INCLUDED */ - /* EOF */ diff --git a/reactos/subsystems/win32/csrss/win32csr/resource.h b/reactos/subsystems/win32/csrss/win32csr/resource.h index 9f4b485cb6f..eaadd2f2349 100644 --- a/reactos/subsystems/win32/csrss/win32csr/resource.h +++ b/reactos/subsystems/win32/csrss/win32csr/resource.h @@ -6,8 +6,7 @@ * PURPOSE: Resource #defines */ -#ifndef WIN32CSR_RESOURCE_H_INCLUDED -#define WIN32CSR_RESOURCE_H_INCLUDED +#pragma once #define IDD_END_NOW 10 #define IDD_NOT_RESPONDING 11 @@ -49,8 +48,4 @@ #define IDS_SCROLLUP 309 #define IDS_SCROLLDOWN 310 - - -#endif /* WIN32CSR_RESOURCE_H_INCLUDED */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/dib/dib.h b/reactos/subsystems/win32/win32k/dib/dib.h index 9bcf52d6f42..bae2199fe59 100644 --- a/reactos/subsystems/win32/win32k/dib/dib.h +++ b/reactos/subsystems/win32/win32k/dib/dib.h @@ -1,5 +1,4 @@ -#ifndef _W32K_DIB_DIB_H -#define _W32K_DIB_DIB_H +#pragma once #ifdef _M_IX86 #define memset4(dest, value, count) asm volatile("rep stosl" : : "D"(dest), "a"(value), "c"(count) : "memory"); @@ -148,6 +147,3 @@ ULONG DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern); #define DIB_GetSourceIndex(SourceSurf,sx,sy) \ DibFunctionsForBitmapFormat[SourceSurf->iBitmapFormat]. \ DIB_GetPixel(SourceSurf, sx, sy) - -#endif /* _W32K_DIB_DIB_H */ - diff --git a/reactos/subsystems/win32/win32k/include/accelerator.h b/reactos/subsystems/win32/win32k/include/accelerator.h index d4ad5982876..f9aea474215 100644 --- a/reactos/subsystems/win32/win32k/include/accelerator.h +++ b/reactos/subsystems/win32/win32k/include/accelerator.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_ACCELERATOR_H -#define _WIN32K_ACCELERATOR_H +#pragma once #include #include @@ -19,5 +18,3 @@ NTSTATUS FASTCALL CleanupAcceleratorImpl(VOID); PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL); - -#endif /* _WIN32K_ACCELERATOR_H */ diff --git a/reactos/subsystems/win32/win32k/include/bitmaps.h b/reactos/subsystems/win32/win32k/include/bitmaps.h index 2cfd7c49cdb..6a5e731c375 100644 --- a/reactos/subsystems/win32/win32k/include/bitmaps.h +++ b/reactos/subsystems/win32/win32k/include/bitmaps.h @@ -1,5 +1,4 @@ -#ifndef __WIN32K_BITMAPS_H -#define __WIN32K_BITMAPS_H +#pragma once #include "surface.h" @@ -11,5 +10,3 @@ HBITMAP FASTCALL IntCreateBitmap(IN SIZEL Size, IN LONG Width, IN ULONG Format, HBITMAP FASTCALL BITMAP_CopyBitmap (HBITMAP hBitmap); UINT FASTCALL BITMAP_GetRealBitsPixel(UINT nBitsPixel); INT FASTCALL BITMAP_GetWidthBytes (INT bmWidth, INT bpp); - -#endif diff --git a/reactos/subsystems/win32/win32k/include/brush.h b/reactos/subsystems/win32/win32k/include/brush.h index 2c114d04fb1..8c9a7a8b21f 100644 --- a/reactos/subsystems/win32/win32k/include/brush.h +++ b/reactos/subsystems/win32/win32k/include/brush.h @@ -1,5 +1,4 @@ -#ifndef __WIN32K_BRUSH_H -#define __WIN32K_BRUSH_H +#pragma once #include "gdiobj.h" @@ -133,5 +132,3 @@ PVOID FASTCALL AllocateObjectAttr(VOID); VOID FASTCALL FreeObjectAttr(PVOID); BOOL FASTCALL IntGdiSetBrushOwner(PBRUSH,DWORD); - -#endif diff --git a/reactos/subsystems/win32/win32k/include/callback.h b/reactos/subsystems/win32/win32k/include/callback.h index 61b80745552..0b978a67e49 100644 --- a/reactos/subsystems/win32/win32k/include/callback.h +++ b/reactos/subsystems/win32/win32k/include/callback.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_CALLBACK_H -#define _WIN32K_CALLBACK_H +#pragma once #include @@ -57,5 +56,3 @@ IntCbFreeMemory(PVOID Data); HMENU APIENTRY co_IntCallLoadMenu(HINSTANCE,PUNICODE_STRING); NTSTATUS APIENTRY co_IntClientThreadSetup(VOID); - -#endif /* _WIN32K_CALLBACK_H */ diff --git a/reactos/subsystems/win32/win32k/include/caret.h b/reactos/subsystems/win32/win32k/include/caret.h index dc6dae5dd81..8c7998c0c6f 100644 --- a/reactos/subsystems/win32/win32k/include/caret.h +++ b/reactos/subsystems/win32/win32k/include/caret.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_CARET_H -#define _WIN32K_CARET_H +#pragma once #include #include @@ -22,7 +21,4 @@ BOOL FASTCALL co_UserShowCaret(PWINDOW_OBJECT WindowObject); BOOL FASTCALL co_UserHideCaret(PWINDOW_OBJECT WindowObject); - -#endif /* _WIN32K_CARET_H */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/class.h b/reactos/subsystems/win32/win32k/include/class.h index 70b78763f82..ac36f6b32ce 100644 --- a/reactos/subsystems/win32/win32k/include/class.h +++ b/reactos/subsystems/win32/win32k/include/class.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_CLASS_H -#define _WIN32K_CLASS_H +#pragma once #include #include @@ -106,6 +105,4 @@ BOOL FASTCALL LookupFnIdToiCls(int, int * ); WNDPROC FASTCALL IntGetClassWndProc(PCLS, BOOL); ULONG_PTR FASTCALL UserGetCPD(PVOID,GETCPD,ULONG_PTR); -#endif /* _WIN32K_CLASS_H */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/cleanup.h b/reactos/subsystems/win32/win32k/include/cleanup.h index 46d6496e2ea..c5a55e536a7 100644 --- a/reactos/subsystems/win32/win32k/include/cleanup.h +++ b/reactos/subsystems/win32/win32k/include/cleanup.h @@ -1,5 +1,4 @@ -#ifndef _SUBSYS_WIN32K_INCLUDE_CLEANUP_H -#define _SUBSYS_WIN32K_INCLUDE_CLEANUP_H +#pragma once NTSTATUS FASTCALL InitCleanupImpl(VOID); @@ -16,5 +15,3 @@ IntUnicodeStringToNULLTerminated(PWSTR *Dest, PUNICODE_STRING Src); void FASTCALL IntFreeNULLTerminatedFromUnicodeString(PWSTR NullTerminated, PUNICODE_STRING UnicodeString); - -#endif /* ndef _SUBSYS_WIN32K_INCLUDE_CLEANUP_H */ diff --git a/reactos/subsystems/win32/win32k/include/clipboard.h b/reactos/subsystems/win32/win32k/include/clipboard.h index 95e961b6d9b..819ba98477b 100644 --- a/reactos/subsystems/win32/win32k/include/clipboard.h +++ b/reactos/subsystems/win32/win32k/include/clipboard.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_CLIPBOARD_H -#define _WIN32K_CLIPBOARD_H +#pragma once #include "window.h" #include @@ -50,5 +49,3 @@ UINT APIENTRY IntEnumClipboardFormats(UINT format); UINT FASTCALL IntEnumClipboardFormats(UINT format); */ - -#endif /* _WIN32K_CLIPBOARD_H */ diff --git a/reactos/subsystems/win32/win32k/include/cliprgn.h b/reactos/subsystems/win32/win32k/include/cliprgn.h index 1dfca64c189..aef5998d505 100644 --- a/reactos/subsystems/win32/win32k/include/cliprgn.h +++ b/reactos/subsystems/win32/win32k/include/cliprgn.h @@ -1,5 +1,4 @@ -#ifndef __WIN32K_CLIPRGN_H -#define __WIN32K_CLIPRGN_H +#pragma once #include #include @@ -10,5 +9,3 @@ INT FASTCALL IntGdiExtSelectClipRgn (PDC, PROSRGNDATA, int); INT FASTCALL GdiGetClipBox(HDC hDC, RECTL *rc); INT FASTCALL GdiSelectVisRgn(HDC hdc, HRGN hrgn); INT FASTCALL GdiExtSelectClipRgn (PDC dc, HRGN hrgn, int fnMode); - -#endif /* not __WIN32K_CLIPRGN_H */ diff --git a/reactos/subsystems/win32/win32k/include/color.h b/reactos/subsystems/win32/win32k/include/color.h index cb8c3108817..0972f2e8dd3 100644 --- a/reactos/subsystems/win32/win32k/include/color.h +++ b/reactos/subsystems/win32/win32k/include/color.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_COLOR_H -#define _WIN32K_COLOR_H +#pragma once #ifndef CLR_INVALID #define CLR_INVALID 0xffffffff @@ -40,5 +39,3 @@ INT APIENTRY COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size, XLATE UINT FASTCALL IntGdiRealizePalette (HDC); HCOLORSPACE FASTCALL IntGdiCreateColorSpace(PLOGCOLORSPACEEXW); BOOL FASTCALL IntGdiDeleteColorSpace(HCOLORSPACE); - -#endif /* _WIN32K_COLOR_H */ diff --git a/reactos/subsystems/win32/win32k/include/coord.h b/reactos/subsystems/win32/win32k/include/coord.h index bec402026cb..c241b9eb9b6 100644 --- a/reactos/subsystems/win32/win32k/include/coord.h +++ b/reactos/subsystems/win32/win32k/include/coord.h @@ -1,5 +1,4 @@ -#ifndef __WIN32K_COORD_H -#define __WIN32K_COORD_H +#pragma once #include @@ -20,5 +19,3 @@ IntGdiModifyWorldTransform(PDC pDc, VOID FASTCALL IntMirrorWindowOrg(PDC); void FASTCALL IntFixIsotropicMapping(PDC dc); - -#endif diff --git a/reactos/subsystems/win32/win32k/include/csr.h b/reactos/subsystems/win32/win32k/include/csr.h index e3caa96cd0c..4f5dc8daf53 100644 --- a/reactos/subsystems/win32/win32k/include/csr.h +++ b/reactos/subsystems/win32/win32k/include/csr.h @@ -7,8 +7,7 @@ * PROGRAMER: Ge van Geldorp (ge@gse.nl) */ -#ifndef CSR_H_INCLUDED -#define CSR_H_INCLUDED +#pragma once extern PEPROCESS CsrProcess; @@ -19,6 +18,4 @@ NTSTATUS WINAPI CsrInsertObject(HANDLE ObjectHandle, ACCESS_MASK DesiredAccess, PHANDLE Handle); -#endif /* CSR_H_INCLUDED */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/cursoricon.h b/reactos/subsystems/win32/win32k/include/cursoricon.h index c2b66b15b23..280ab555601 100644 --- a/reactos/subsystems/win32/win32k/include/cursoricon.h +++ b/reactos/subsystems/win32/win32k/include/cursoricon.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_CURSORICON_H -#define _WIN32K_CURSORICON_H +#pragma once #define MAXCURICONHANDLES 4096 @@ -106,8 +105,4 @@ GreMovePointer( LONG x, LONG y); -#endif /* _WIN32K_CURSORICON_H */ - /* EOF */ - - diff --git a/reactos/subsystems/win32/win32k/include/dc.h b/reactos/subsystems/win32/win32k/include/dc.h index 80d66209e36..b616bdc0ba6 100644 --- a/reactos/subsystems/win32/win32k/include/dc.h +++ b/reactos/subsystems/win32/win32k/include/dc.h @@ -1,5 +1,4 @@ -#ifndef __WIN32K_DC_H -#define __WIN32K_DC_H +#pragma once typedef struct _DC *PDC; @@ -232,5 +231,3 @@ DC_vSelectPalette(PDC pdc, PPALETTE ppal) BOOL FASTCALL IntPrepareDriverIfNeeded(VOID); extern PDEVOBJ PrimarySurface; - -#endif /* not __WIN32K_DC_H */ diff --git a/reactos/subsystems/win32/win32k/include/dce.h b/reactos/subsystems/win32/win32k/include/dce.h index 87adfd7adb8..de83e8a5c02 100644 --- a/reactos/subsystems/win32/win32k/include/dce.h +++ b/reactos/subsystems/win32/win32k/include/dce.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_DCE_H -#define _WIN32K_DCE_H +#pragma once /* Ported from WINE by Jason Filby */ @@ -64,5 +63,3 @@ void FASTCALL DceFreeClassDCE(HDC); HWND FASTCALL UserGethWnd(HDC,PWNDOBJ*); void FASTCALL DceFreeWindowDCE(PWINDOW_OBJECT); void FASTCALL DceFreeThreadDCE(PTHREADINFO); - -#endif /* _WIN32K_DCE_H */ diff --git a/reactos/subsystems/win32/win32k/include/desktop.h b/reactos/subsystems/win32/win32k/include/desktop.h index fe7a93fdd81..ecdd4209376 100644 --- a/reactos/subsystems/win32/win32k/include/desktop.h +++ b/reactos/subsystems/win32/win32k/include/desktop.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_DESKTOP_H -#define _WIN32K_DESKTOP_H +#pragma once #include "msgqueue.h" #include "window.h" @@ -252,6 +251,4 @@ DesktopHeapAddressToUser(PVOID lpMem) return NULL; } -#endif /* _WIN32K_DESKTOP_H */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/dib.h b/reactos/subsystems/win32/win32k/include/dib.h index 4ab6efe0bc3..479476d3850 100644 --- a/reactos/subsystems/win32/win32k/include/dib.h +++ b/reactos/subsystems/win32/win32k/include/dib.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_DIB_H -#define _WIN32K_DIB_H +#pragma once #include "dc.h" @@ -18,5 +17,3 @@ DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi); HPALETTE FASTCALL BuildDIBPalette (CONST BITMAPINFO *bmi, PINT paletteType); - -#endif /* _WIN32K_DIB_H */ diff --git a/reactos/subsystems/win32/win32k/include/driver.h b/reactos/subsystems/win32/win32k/include/driver.h index 04cd33b986f..8e89f595b47 100644 --- a/reactos/subsystems/win32/win32k/include/driver.h +++ b/reactos/subsystems/win32/win32k/include/driver.h @@ -1,6 +1,4 @@ - -#ifndef __WIN32K_DRIVER_H -#define __WIN32K_DRIVER_H +#pragma once #include @@ -21,7 +19,3 @@ BOOL DRIVER_BuildDDIFunctions(PDRVENABLEDATA DED, BOOL DRIVER_UnregisterDriver(LPCWSTR Name); INT DRIVER_ReferenceDriver (LPCWSTR Name); INT DRIVER_UnreferenceDriver (LPCWSTR Name); - -#endif - - diff --git a/reactos/subsystems/win32/win32k/include/driverobj.h b/reactos/subsystems/win32/win32k/include/driverobj.h index 0799465484a..4056083528d 100644 --- a/reactos/subsystems/win32/win32k/include/driverobj.h +++ b/reactos/subsystems/win32/win32k/include/driverobj.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_DRIVEROBJ_H -#define _WIN32K_DRIVEROBJ_H +#pragma once #include "gdiobj.h" @@ -19,5 +18,3 @@ BOOL INTERNAL_CALL DRIVEROBJ_Cleanup(PVOID pObject); #define DRIVEROBJ_FreeObjectByHandle(hdo) GDIOBJ_FreeObjByHandle((HGDIOBJ)hdo, GDI_OBJECT_TYPE_DRIVEROBJ) #define DRIVEROBJ_LockObject(hdo) ((PEDRIVEROBJ)GDIOBJ_LockObj((HGDIOBJ)hdo, GDI_OBJECT_TYPE_DRIVEROBJ)) #define DRIVEROBJ_UnlockObject(pdo) GDIOBJ_UnlockObjByPtr((POBJ)pdo) - -#endif /* !_WIN32K_DRIVEROBJ_H */ diff --git a/reactos/subsystems/win32/win32k/include/eng.h b/reactos/subsystems/win32/win32k/include/eng.h index 45d61e98995..82e24631c79 100644 --- a/reactos/subsystems/win32/win32k/include/eng.h +++ b/reactos/subsystems/win32/win32k/include/eng.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_ENG_H -#define _WIN32K_ENG_H +#pragma once BOOL APIENTRY EngIntersectRect (PRECTL prcDst, PRECTL prcSrc1, PRECTL prcSrc2); VOID FASTCALL EngDeleteXlate (XLATEOBJ *XlateObj); @@ -22,5 +21,3 @@ IntEngWindowChanged( VOID FASTCALL IntGdiAcquireSemaphore ( HSEMAPHORE hsem ); VOID FASTCALL IntGdiReleaseSemaphore ( HSEMAPHORE hsem ); ULONGLONG APIENTRY EngGetTickCount(VOID); - -#endif /* _WIN32K_ENG_H */ diff --git a/reactos/subsystems/win32/win32k/include/engevent.h b/reactos/subsystems/win32/win32k/include/engevent.h index 98ffb54c302..a1249f05fe8 100644 --- a/reactos/subsystems/win32/win32k/include/engevent.h +++ b/reactos/subsystems/win32/win32k/include/engevent.h @@ -1,5 +1,4 @@ -#ifndef __WIN32K_ENGEVENT_H -#define __WIN32K_ENGEVENT_H +#pragma once #define ENG_EVENT_USERMAPPED 1 @@ -12,5 +11,3 @@ typedef struct _ENG_EVENT /* Private part */ KEVENT KEvent; } ENG_EVENT, *PENG_EVENT; - -#endif diff --git a/reactos/subsystems/win32/win32k/include/engobjects.h b/reactos/subsystems/win32/win32k/include/engobjects.h index 0da73d561ad..afb09204874 100644 --- a/reactos/subsystems/win32/win32k/include/engobjects.h +++ b/reactos/subsystems/win32/win32k/include/engobjects.h @@ -25,8 +25,8 @@ * REVISION HISTORY: * 21/8/1999: Created */ -#ifndef __ENG_OBJECTS_H -#define __ENG_OBJECTS_H + +#pragma once #include #include @@ -133,6 +133,3 @@ typedef struct _XFORMGDI { we can simply typecast the pointer */ #define ObjToGDI(ClipObj, Type) (Type##GDI *)(ClipObj) #define GDIToObj(ClipGDI, Type) (Type##OBJ *)(ClipGDI) - - -#endif //__ENG_OBJECTS_H diff --git a/reactos/subsystems/win32/win32k/include/error.h b/reactos/subsystems/win32/win32k/include/error.h index 6b923536257..92a1cbf92a8 100644 --- a/reactos/subsystems/win32/win32k/include/error.h +++ b/reactos/subsystems/win32/win32k/include/error.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_ERROR_H -#define _WIN32K_ERROR_H +#pragma once VOID FASTCALL SetLastNtError( @@ -12,6 +11,4 @@ SetLastWin32Error( NTSTATUS FASTCALL GetLastNtError(VOID); -#endif /* _WIN32K_ERROR_H */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/floatobj.h b/reactos/subsystems/win32/win32k/include/floatobj.h index ff9abf03d1f..0699263dad7 100644 --- a/reactos/subsystems/win32/win32k/include/floatobj.h +++ b/reactos/subsystems/win32/win32k/include/floatobj.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_FLOATOBJ_H_ -#define _WIN32K_FLOATOBJ_H_ +#pragma once #if defined(_X86_) @@ -71,5 +70,3 @@ _FLOATOBJ_Equal1(FLOATOBJ *pf) #define FLOATOBJ_Set1(fo) *(fo) = 1; #endif - -#endif /* not _WIN32K_FLOATOBJ_H_ */ diff --git a/reactos/subsystems/win32/win32k/include/focus.h b/reactos/subsystems/win32/win32k/include/focus.h index 03438bb3b16..859d1c75849 100644 --- a/reactos/subsystems/win32/win32k/include/focus.h +++ b/reactos/subsystems/win32/win32k/include/focus.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_FOCUS_H -#define _WIN32K_FOCUS_H +#pragma once /* * These functions take the window handles from current message queue. @@ -23,5 +22,3 @@ BOOL FASTCALL co_IntSetForegroundWindow(PWINDOW_OBJECT Window); HWND FASTCALL co_IntSetActiveWindow(PWINDOW_OBJECT Window); - -#endif /* _WIN32K_FOCUS_H */ diff --git a/reactos/subsystems/win32/win32k/include/gdifloat.h b/reactos/subsystems/win32/win32k/include/gdifloat.h index 2b53b8e7f76..5f789887784 100644 --- a/reactos/subsystems/win32/win32k/include/gdifloat.h +++ b/reactos/subsystems/win32/win32k/include/gdifloat.h @@ -1,6 +1,4 @@ -#ifndef __WIN32K_FLOAT_H -#define __WIN32K_FLOAT_H - +#pragma once #include #include @@ -108,7 +106,3 @@ static __inline void INTERNAL_LPTODP(DC *dc, LPPOINT point) MulDiv((tx), (pdcattr)->szlViewportExt.cx, (pdcattr)->szlWindowExt.cx) #define YLSTODS(pdcattr,ty) \ MulDiv((ty), (pdcattr)->szlViewportExt.cy, (pdcattr)->szlWindowExt.cy) - -#endif - - diff --git a/reactos/subsystems/win32/win32k/include/gdiobj.h b/reactos/subsystems/win32/win32k/include/gdiobj.h index 489e98e9278..50ed2e6163f 100644 --- a/reactos/subsystems/win32/win32k/include/gdiobj.h +++ b/reactos/subsystems/win32/win32k/include/gdiobj.h @@ -3,8 +3,7 @@ * */ -#ifndef __WIN32K_GDIOBJ_H -#define __WIN32K_GDIOBJ_H +#pragma once /* Public GDI Object/Handle definitions */ #include @@ -132,5 +131,3 @@ GDIOBJ_IncrementShareCount(POBJ Object) #endif INT FASTCALL GreGetObjectOwner(HGDIOBJ, GDIOBJTYPE); - -#endif diff --git a/reactos/subsystems/win32/win32k/include/guicheck.h b/reactos/subsystems/win32/win32k/include/guicheck.h index 3cdcd7b7000..5e1c5c9c385 100644 --- a/reactos/subsystems/win32/win32k/include/guicheck.h +++ b/reactos/subsystems/win32/win32k/include/guicheck.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_GUICHECK_H -#define _WIN32K_GUICHECK_H +#pragma once BOOL FASTCALL co_IntGraphicsCheck(BOOL Create); BOOL FASTCALL IntCreatePrimarySurface(VOID); @@ -7,6 +6,4 @@ VOID FASTCALL IntDestroyPrimarySurface(VOID); NTSTATUS FASTCALL InitGuiCheckImpl (VOID); -#endif /* _WIN32K_GUICHECK_H */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/hook.h b/reactos/subsystems/win32/win32k/include/hook.h index cd0e48318fe..d09304b4895 100644 --- a/reactos/subsystems/win32/win32k/include/hook.h +++ b/reactos/subsystems/win32/win32k/include/hook.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_HOOK_H -#define _WIN32K_HOOK_H +#pragma once #define HOOK_THREAD_REFERENCED (0x1) #define NB_HOOKS (WH_MAXHOOK-WH_MINHOOK+1) @@ -40,6 +39,4 @@ PHOOK FASTCALL IntGetHookObject(HHOOK); PHOOK FASTCALL IntGetNextHook(PHOOK Hook); LRESULT FASTCALL UserCallNextHookEx( PHOOK pHook, int Code, WPARAM wParam, LPARAM lParam, BOOL Ansi); -#endif /* _WIN32K_HOOK_H */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/hotkey.h b/reactos/subsystems/win32/win32k/include/hotkey.h index 25c79fc1ec4..1e1c6636c96 100644 --- a/reactos/subsystems/win32/win32k/include/hotkey.h +++ b/reactos/subsystems/win32/win32k/include/hotkey.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_HOTKEY_H -#define _WIN32K_HOTKEY_H +#pragma once #include #include @@ -33,6 +32,4 @@ UnregisterWindowHotKeys(PWINDOW_OBJECT Window); VOID FASTCALL UnregisterThreadHotKeys(struct _ETHREAD *Thread); -#endif /* _WIN32K_HOTKEY_H */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/input.h b/reactos/subsystems/win32/win32k/include/input.h index a47136e0d09..2a00fe20e9e 100644 --- a/reactos/subsystems/win32/win32k/include/input.h +++ b/reactos/subsystems/win32/win32k/include/input.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_INPUT_H -#define _WIN32K_INPUT_H +#pragma once #include @@ -49,5 +48,3 @@ BOOL FASTCALL IntConnectThreadInput(PTHREADINFO,PTHREADINFO*,PUSER_MESSAGE_QUEUE (TRUE) extern PTHREADINFO ptiRawInput; - -#endif /* _WIN32K_INPUT_H */ diff --git a/reactos/subsystems/win32/win32k/include/intddraw.h b/reactos/subsystems/win32/win32k/include/intddraw.h index b64a3a4dde7..934900353c8 100644 --- a/reactos/subsystems/win32/win32k/include/intddraw.h +++ b/reactos/subsystems/win32/win32k/include/intddraw.h @@ -1,5 +1,4 @@ -#ifndef _INT_W32k_DDRAW -#define _INT_W32k_DDRAW +#pragma once #include #include @@ -136,5 +135,3 @@ void dump_halinfo(DD_HALINFO *pHalInfo); DPRINT1("\n");\ if (flag != 0) \ DPRINT1("undoc value in %s flags value %08lx\n",text, (ULONG) dwflag); - -#endif /* _INT_W32k_DDRAW */ diff --git a/reactos/subsystems/win32/win32k/include/inteng.h b/reactos/subsystems/win32/win32k/include/inteng.h index 515c8785b21..dc0bc98a845 100644 --- a/reactos/subsystems/win32/win32k/include/inteng.h +++ b/reactos/subsystems/win32/win32k/include/inteng.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_INTENG_H -#define _WIN32K_INTENG_H +#pragma once typedef ULONG HCLIP; @@ -190,5 +189,3 @@ IntEngCopyBits(SURFOBJ *psoDest, XLATEOBJ *pxlo, RECTL *prclDest, POINTL *ptlSource); - -#endif /* _WIN32K_INTENG_H */ diff --git a/reactos/subsystems/win32/win32k/include/intgdi.h b/reactos/subsystems/win32/win32k/include/intgdi.h index d5e63c9b641..1b7a700c32f 100644 --- a/reactos/subsystems/win32/win32k/include/intgdi.h +++ b/reactos/subsystems/win32/win32k/include/intgdi.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_INTGDI_H -#define _WIN32K_INTGDI_H +#pragma once #include "region.h" @@ -261,6 +260,3 @@ GreStretchBltMask(IN HDC hdcDst, IN HDC hdcMask, IN INT xMask, IN INT yMask); - -#endif /* _WIN32K_INTGDI_H */ - diff --git a/reactos/subsystems/win32/win32k/include/menu.h b/reactos/subsystems/win32/win32k/include/menu.h index a89eb891950..a9ad71eb3a2 100644 --- a/reactos/subsystems/win32/win32k/include/menu.h +++ b/reactos/subsystems/win32/win32k/include/menu.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_MENU_H -#define _WIN32K_MENU_H +#pragma once #define IS_ATOM(x) \ (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000)) @@ -110,5 +109,3 @@ InitMenuImpl(VOID); NTSTATUS FASTCALL CleanupMenuImpl(VOID); - -#endif /* _WIN32K_MENU_H */ diff --git a/reactos/subsystems/win32/win32k/include/misc.h b/reactos/subsystems/win32/win32k/include/misc.h index 6ec5f26348c..366c44b4b7c 100644 --- a/reactos/subsystems/win32/win32k/include/misc.h +++ b/reactos/subsystems/win32/win32k/include/misc.h @@ -1,5 +1,4 @@ -#ifndef __WIN32K_MISC_H -#define __WIN32K_MISC_H +#pragma once typedef struct INTENG_ENTER_LEAVE_TAG { @@ -47,5 +46,3 @@ RegWriteUserSetting( IN ULONG ulType, OUT PVOID pvData, IN ULONG cbDataSize); - -#endif /* __WIN32K_MISC_H */ diff --git a/reactos/subsystems/win32/win32k/include/mmcopy.h b/reactos/subsystems/win32/win32k/include/mmcopy.h index 862a092865f..ad67bb5f90c 100644 --- a/reactos/subsystems/win32/win32k/include/mmcopy.h +++ b/reactos/subsystems/win32/win32k/include/mmcopy.h @@ -1,5 +1,4 @@ -#ifndef NDK_MMCOPY_H -#define NDK_MMCOPY_H +#pragma once #include @@ -8,5 +7,3 @@ NTSTATUS _MmCopyToCaller( PVOID Target, PVOID Source, UINT Bytes ); #define MmCopyFromCaller(x,y,z) _MmCopyFromCaller((PCHAR)(x),(PCHAR)(y),(UINT)(z)) #define MmCopyToCaller(x,y,z) _MmCopyToCaller((PCHAR)(x),(PCHAR)(y),(UINT)(z)) - -#endif/*NDK_MMCOPY_H*/ diff --git a/reactos/subsystems/win32/win32k/include/monitor.h b/reactos/subsystems/win32/win32k/include/monitor.h index f0337dbba7d..6c4282885ca 100644 --- a/reactos/subsystems/win32/win32k/include/monitor.h +++ b/reactos/subsystems/win32/win32k/include/monitor.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_MONITOR_H -#define _WIN32K_MONITOR_H +#pragma once /* monitor object */ typedef struct _MONITOR @@ -41,6 +40,4 @@ NTSTATUS IntDetachMonitor(PDEVOBJ *pGdiDevice); PMONITOR FASTCALL UserGetMonitorObject(IN HMONITOR); PMONITOR FASTCALL IntGetPrimaryMonitor(VOID); -#endif /* _WIN32K_MONITOR_H */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/mouse.h b/reactos/subsystems/win32/win32k/include/mouse.h index b00903b2203..0e5f68b9626 100644 --- a/reactos/subsystems/win32/win32k/include/mouse.h +++ b/reactos/subsystems/win32/win32k/include/mouse.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_MOUSE_H -#define _WIN32K_MOUSE_H +#pragma once #include @@ -18,5 +17,3 @@ INT INTERNAL_CALL MouseSafetyOnDrawEnd(SURFOBJ *SurfObj); #ifndef MOUSEEVENTF_XUP #define MOUSEEVENTF_XUP (0x100) #endif - -#endif /* _WIN32K_MOUSE_H */ diff --git a/reactos/subsystems/win32/win32k/include/msgqueue.h b/reactos/subsystems/win32/win32k/include/msgqueue.h index 234d0b59eeb..eadc3ab1ecf 100644 --- a/reactos/subsystems/win32/win32k/include/msgqueue.h +++ b/reactos/subsystems/win32/win32k/include/msgqueue.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_MSGQUEUE_H -#define _WIN32K_MSGQUEUE_H +#pragma once #include "hook.h" @@ -279,6 +278,4 @@ MsqCalculateMessageTime(IN PLARGE_INTEGER TickCount) return (LONG)(TickCount->QuadPart * (KeQueryTimeIncrement() / 10000)); } -#endif /* _WIN32K_MSGQUEUE_H */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/ntuser.h b/reactos/subsystems/win32/win32k/include/ntuser.h index d64e246056b..58a911d6f82 100644 --- a/reactos/subsystems/win32/win32k/include/ntuser.h +++ b/reactos/subsystems/win32/win32k/include/ntuser.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_NTUSER_H -#define _WIN32K_NTUSER_H +#pragma once #define DECLARE_RETURN(type) type _ret_ #define RETURN(value) { _ret_ = value; goto _cleanup_; } @@ -20,7 +19,4 @@ VOID FASTCALL UserLeave(VOID); BOOL FASTCALL UserIsEntered(VOID); BOOL FASTCALL UserIsEnteredExclusive(VOID); - -#endif /* _WIN32K_NTUSER_H */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/object.h b/reactos/subsystems/win32/win32k/include/object.h index 0ff67ce0c25..437611aa09d 100644 --- a/reactos/subsystems/win32/win32k/include/object.h +++ b/reactos/subsystems/win32/win32k/include/object.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_OBJECT_H -#define _WIN32K_OBJECT_H +#pragma once #include "gdiobj.h" #include "bitmaps.h" @@ -145,6 +144,4 @@ VOID FASTCALL CreateSysColorObjects (VOID); PPOINT FASTCALL GDI_Bezier (const POINT *Points, INT count, PINT nPtsOut); -#endif /* _WIN32K_OBJECT_H */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/paint.h b/reactos/subsystems/win32/win32k/include/paint.h index c45c83eb2a2..698321c2b75 100644 --- a/reactos/subsystems/win32/win32k/include/paint.h +++ b/reactos/subsystems/win32/win32k/include/paint.h @@ -1,9 +1,6 @@ -#ifndef _WIN32K_PAINT_H -#define _WIN32K_PAINT_H +#pragma once BOOL APIENTRY FillSolid (SURFOBJ* Surface, RECTL* Dimensions, ULONG iColor); BOOL APIENTRY FillPolygon ( DC* dc, SURFACE* pSurface, BRUSHOBJ* BrushObj, MIX RopMode, CONST PPOINT Points, INT Count, RECTL BoundRect ); BOOL FASTCALL IntFillPolygon(PDC dc, SURFACE *psurf, BRUSHOBJ *BrushObj, CONST PPOINT Points, int Count, RECTL DestRect, POINTL *BrushOrigin); - -#endif /* _WIN32K_PAINT_H */ diff --git a/reactos/subsystems/win32/win32k/include/painting.h b/reactos/subsystems/win32/win32k/include/painting.h index d75d24ebc34..ed7bea47f64 100644 --- a/reactos/subsystems/win32/win32k/include/painting.h +++ b/reactos/subsystems/win32/win32k/include/painting.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_PAINTING_H -#define _WIN32K_PAINTING_H +#pragma once #include #include @@ -14,5 +13,3 @@ IntGetPaintMessage(PWINDOW_OBJECT Window, UINT MsgFilterMin, UINT MsgFilterMax, MSG *Message, BOOL Remove); INT FASTCALL UserRealizePalette(HDC); INT FASTCALL co_UserGetUpdateRgn(PWINDOW_OBJECT, HRGN, BOOL); - -#endif /* _WIN32K_PAINTING_H */ diff --git a/reactos/subsystems/win32/win32k/include/palette.h b/reactos/subsystems/win32/win32k/include/palette.h index 102654573fe..43f59e6efca 100644 --- a/reactos/subsystems/win32/win32k/include/palette.h +++ b/reactos/subsystems/win32/win32k/include/palette.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_PALETTE_H -#define _WIN32K_PALETTE_H +#pragma once #include @@ -113,5 +112,3 @@ PALETTE_ulGetRGBColorFromIndex(PPALETTE ppal, ULONG ulIndex) ppal->IndexedColors[ulIndex].peGreen, ppal->IndexedColors[ulIndex].peBlue); } - -#endif /* not _WIN32K_PALETTE_H */ diff --git a/reactos/subsystems/win32/win32k/include/path.h b/reactos/subsystems/win32/win32k/include/path.h index 1aae479b282..b8c17786fa9 100644 --- a/reactos/subsystems/win32/win32k/include/path.h +++ b/reactos/subsystems/win32/win32k/include/path.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_PATH_H -#define _WIN32K_PATH_H +#pragma once /* DCPATH flPath */ #define DCPATH_ACTIVE 0x0001 @@ -71,5 +70,3 @@ BOOL FASTCALL PATH_ExtTextOut(PDC dc,INT x,INT y,UINT flags,const RECTL *lprc,LP VOID FASTCALL IntGdiCloseFigure(PPATH pPath); BOOL FASTCALL PATH_Delete(HPATH hPath); - -#endif /* _WIN32K_PATH_H */ diff --git a/reactos/subsystems/win32/win32k/include/pdevobj.h b/reactos/subsystems/win32/win32k/include/pdevobj.h index 94b3d56405b..4124509fbe5 100644 --- a/reactos/subsystems/win32/win32k/include/pdevobj.h +++ b/reactos/subsystems/win32/win32k/include/pdevobj.h @@ -1,5 +1,4 @@ -#ifndef __WIN32K_PDEVOBJ_H -#define __WIN32K_PDEVOBJ_H +#pragma once #include @@ -143,5 +142,3 @@ typedef struct _PDEVEDD } PDEVEDD, *PPDEVEDD; extern ULONG gdwDirectDrawContext; - -#endif /* !__WIN32K_PDEVOBJ_H */ diff --git a/reactos/subsystems/win32/win32k/include/pen.h b/reactos/subsystems/win32/win32k/include/pen.h index b6d85c5ba02..7ca623dab54 100644 --- a/reactos/subsystems/win32/win32k/include/pen.h +++ b/reactos/subsystems/win32/win32k/include/pen.h @@ -1,5 +1,4 @@ -#ifndef __WIN32K_PEN_H -#define __WIN32K_PEN_H +#pragma once #include "gdiobj.h" #include "brush.h" @@ -31,5 +30,3 @@ PBRUSH FASTCALL PEN_LockPen(HGDIOBJ); PBRUSH FASTCALL PEN_ShareLockPen(HGDIOBJ); INT APIENTRY PEN_GetObject(PBRUSH pPen, INT Count, PLOGPEN Buffer); - -#endif diff --git a/reactos/subsystems/win32/win32k/include/prop.h b/reactos/subsystems/win32/win32k/include/prop.h index 2d33df9971d..4eb86525f95 100644 --- a/reactos/subsystems/win32/win32k/include/prop.h +++ b/reactos/subsystems/win32/win32k/include/prop.h @@ -1,9 +1,5 @@ -#ifndef _WIN32K_PROP_H -#define _WIN32K_PROP_H +#pragma once PPROPERTY FASTCALL IntGetProp(PWINDOW_OBJECT,ATOM); BOOL FASTCALL IntRemoveProp(PWINDOW_OBJECT,ATOM); BOOL FASTCALL IntSetProp(PWINDOW_OBJECT, ATOM, HANDLE); - -#endif /* _WIN32K_PROP_H */ - diff --git a/reactos/subsystems/win32/win32k/include/rect.h b/reactos/subsystems/win32/win32k/include/rect.h index a0687243ab4..156dd55f120 100644 --- a/reactos/subsystems/win32/win32k/include/rect.h +++ b/reactos/subsystems/win32/win32k/include/rect.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_RECT_H -#define _WIN32K_RECT_H +#pragma once VOID FORCEINLINE @@ -57,6 +56,3 @@ RECTL_bIntersectRect(RECTL *prclDst, const RECTL *prcl1, const RECTL *prcl2); VOID FASTCALL RECTL_vMakeWellOrdered(RECTL *prcl); - - -#endif /* _WIN32K_RECT_H */ diff --git a/reactos/subsystems/win32/win32k/include/region.h b/reactos/subsystems/win32/win32k/include/region.h index a7583fbf36b..d29b1b04fdf 100644 --- a/reactos/subsystems/win32/win32k/include/region.h +++ b/reactos/subsystems/win32/win32k/include/region.h @@ -1,6 +1,4 @@ - -#ifndef __WIN32K_REGION_H -#define __WIN32K_REGION_H +#pragma once #include "gdiobj.h" @@ -59,5 +57,3 @@ PROSRGNDATA FASTCALL IntSysCreateRectpRgn(INT,INT,INT,INT); #define IntSysCreateRectpRgnIndirect(prc) \ IntSysCreateRectpRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom) - -#endif /* not __WIN32K_REGION_H */ diff --git a/reactos/subsystems/win32/win32k/include/scroll.h b/reactos/subsystems/win32/win32k/include/scroll.h index 0fe21aef798..171a4eb8389 100644 --- a/reactos/subsystems/win32/win32k/include/scroll.h +++ b/reactos/subsystems/win32/win32k/include/scroll.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_SCROLL_H -#define _WIN32K_SCROLL_H +#pragma once typedef struct tagSBCALC { @@ -62,5 +61,3 @@ typedef struct _SBINFOEX BOOL FASTCALL co_IntCreateScrollBars(PWINDOW_OBJECT Window); BOOL FASTCALL IntDestroyScrollBars(PWINDOW_OBJECT Window); - -#endif /* _WIN32K_SCROLL_H */ diff --git a/reactos/subsystems/win32/win32k/include/surface.h b/reactos/subsystems/win32/win32k/include/surface.h index f9a407aec1c..57a5ec24f85 100644 --- a/reactos/subsystems/win32/win32k/include/surface.h +++ b/reactos/subsystems/win32/win32k/include/surface.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_SURFACE_H -#define _WIN32K_SURFACE_H +#pragma once #include "win32.h" #include "gdiobj.h" @@ -75,5 +74,3 @@ void INTERNAL_CALL SURFACE_CleanupBitsLock(SURFACE *pBMObj); INT FASTCALL BitsPerFormat (ULONG Format); ULONG FASTCALL BitmapFormat (WORD Bits, DWORD Compression); - -#endif /* _WIN32K_SURFACE_H */ diff --git a/reactos/subsystems/win32/win32k/include/sysparams.h b/reactos/subsystems/win32/win32k/include/sysparams.h index 6bc826f2887..2c51a40301a 100644 --- a/reactos/subsystems/win32/win32k/include/sysparams.h +++ b/reactos/subsystems/win32/win32k/include/sysparams.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_SYSPARAMS_H -#define _WIN32K_SYSPARAMS_H +#pragma once #include "cursoricon.h" @@ -178,5 +177,3 @@ typedef union _SPIBUFFER } SPIBUFFER; extern SPIVALUES gspv; - -#endif /* _WIN32K_SYSPARAMS_H */ diff --git a/reactos/subsystems/win32/win32k/include/tags.h b/reactos/subsystems/win32/win32k/include/tags.h index c460b2f42fc..64e8de62874 100644 --- a/reactos/subsystems/win32/win32k/include/tags.h +++ b/reactos/subsystems/win32/win32k/include/tags.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_TAGS_H -#define _WIN32K_TAGS_H +#pragma once #define TAG_STRING ' RTS' /* string */ #define TAG_RTLREGISTRY 'vrqR' /* RTL registry */ @@ -344,5 +343,3 @@ #define USERTAG_WOWTDB 'owsU' #define USERTAG_WOWPROCESSINFO 'pwsU' #define USERTAG_WOWTHREADINFO 'twsU' - -#endif /* _WIN32K_TAGS_H */ diff --git a/reactos/subsystems/win32/win32k/include/text.h b/reactos/subsystems/win32/win32k/include/text.h index 6ee10f39e6a..8c764848233 100644 --- a/reactos/subsystems/win32/win32k/include/text.h +++ b/reactos/subsystems/win32/win32k/include/text.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_TEXT_H -#define _WIN32K_TEXT_H +#pragma once #include @@ -129,5 +128,3 @@ BOOL FASTCALL GreGetTextExtentExW(HDC,LPWSTR,ULONG,ULONG,PULONG,PULONG,LPSIZE,FL #define IntUnLockFreeType \ ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&FreeTypeLock) - -#endif /* _WIN32K_TEXT_H */ diff --git a/reactos/subsystems/win32/win32k/include/timer.h b/reactos/subsystems/win32/win32k/include/timer.h index a10cf6cb76f..73b2c36afae 100644 --- a/reactos/subsystems/win32/win32k/include/timer.h +++ b/reactos/subsystems/win32/win32k/include/timer.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_TIMER_H -#define _WIN32K_TIMER_H +#pragma once typedef struct _TIMER { @@ -37,5 +36,3 @@ UINT_PTR FASTCALL SetSystemTimer(PWINDOW_OBJECT,UINT_PTR,UINT,TIMERPROC); BOOL FASTCALL PostTimerMessages(PWINDOW_OBJECT); VOID FASTCALL ProcessTimers(VOID); VOID FASTCALL StartTheTimers(VOID); - -#endif /* _WIN32K_TIMER_H */ diff --git a/reactos/subsystems/win32/win32k/include/useratom.h b/reactos/subsystems/win32/win32k/include/useratom.h index 4abd0a874af..ada1e3fb2a3 100644 --- a/reactos/subsystems/win32/win32k/include/useratom.h +++ b/reactos/subsystems/win32/win32k/include/useratom.h @@ -1,10 +1,7 @@ -#ifndef _WIN32K_USERATOM_H -#define _WIN32K_USERATOM_H +#pragma once RTL_ATOM FASTCALL IntAddAtom(LPWSTR AtomName); ULONG FASTCALL IntGetAtomName(RTL_ATOM nAtom, LPWSTR lpBuffer, ULONG nSize); RTL_ATOM FASTCALL IntAddGlobalAtom(LPWSTR,BOOL); - -#endif /* _WIN32K_USERATOM_H */ diff --git a/reactos/subsystems/win32/win32k/include/userfuncs.h b/reactos/subsystems/win32/win32k/include/userfuncs.h index 5eed41eb8e0..7ad47e625bc 100644 --- a/reactos/subsystems/win32/win32k/include/userfuncs.h +++ b/reactos/subsystems/win32/win32k/include/userfuncs.h @@ -1,9 +1,4 @@ -#ifndef _WIN32K_USERFUNCS_H -#define _WIN32K_USERFUNCS_H - - - - +#pragma once PMENU_OBJECT FASTCALL UserGetMenuObject(HMENU hMenu); @@ -159,7 +154,4 @@ BOOL FASTCALL UserDestroyMenu(HMENU hMenu); DWORD FASTCALL co_UserShowScrollBar(PWINDOW_OBJECT Window, int wBar, DWORD bShow); - -#endif /* _WIN32K_USERFUNCS_H */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/vis.h b/reactos/subsystems/win32/win32k/include/vis.h index 50253f36dec..5fd4a5fb82b 100644 --- a/reactos/subsystems/win32/win32k/include/vis.h +++ b/reactos/subsystems/win32/win32k/include/vis.h @@ -8,8 +8,7 @@ * */ -#ifndef _WIN32K_VIS_H -#define _WIN32K_VIS_H +#pragma once #include @@ -20,7 +19,4 @@ VIS_ComputeVisibleRegion(PWINDOW_OBJECT Window, BOOLEAN ClientArea, VOID FASTCALL co_VIS_WindowLayoutChanged(PWINDOW_OBJECT Window, HRGN UncoveredRgn); -#endif /* ! defined(_WIN32K_VIS_H) */ - /* EOF */ - diff --git a/reactos/subsystems/win32/win32k/include/win32.h b/reactos/subsystems/win32/win32k/include/win32.h index ad7938389a1..5de6139e1d3 100644 --- a/reactos/subsystems/win32/win32k/include/win32.h +++ b/reactos/subsystems/win32/win32k/include/win32.h @@ -1,5 +1,4 @@ -#ifndef __INCLUDE_NAPI_WIN32_H -#define __INCLUDE_NAPI_WIN32_H +#pragma once /* W32PROCESS flags */ #define W32PF_CONSOLEAPPLICATION 0x00000001 @@ -174,5 +173,3 @@ typedef struct _PROCESSINFO struct _KBL* KeyboardLayout; // THREADINFO only W32HEAP_USER_MAPPING HeapMappings; } PROCESSINFO; - -#endif /* __INCLUDE_NAPI_WIN32_H */ diff --git a/reactos/subsystems/win32/win32k/include/win32k.h b/reactos/subsystems/win32/win32k/include/win32k.h index 4cd9e7b5720..ea3bd61497a 100644 --- a/reactos/subsystems/win32/win32k/include/win32k.h +++ b/reactos/subsystems/win32/win32k/include/win32k.h @@ -7,8 +7,8 @@ */ /* INCLUDES ******************************************************************/ -#ifndef __WIN32K_H -#define __WIN32K_H + +#pragma once #define INTERNAL_CALL APIENTRY /* Internal Win32k Headers */ @@ -79,5 +79,3 @@ #include #include #include - -#endif /* __WIN32K_H */ diff --git a/reactos/subsystems/win32/win32k/include/window.h b/reactos/subsystems/win32/win32k/include/window.h index 82c9e512f48..16098e456b1 100644 --- a/reactos/subsystems/win32/win32k/include/window.h +++ b/reactos/subsystems/win32/win32k/include/window.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_WINDOW_H -#define _WIN32K_WINDOW_H +#pragma once struct _PROPERTY; struct _WINDOW_OBJECT; @@ -159,6 +158,4 @@ VOID FASTCALL IntNotifyWinEvent(DWORD, PWND, LONG, LONG); PWND APIENTRY co_IntCreateWindowEx(DWORD,PUNICODE_STRING,PUNICODE_STRING,DWORD,LONG,LONG,LONG,LONG,HWND,HMENU,HINSTANCE,LPVOID,DWORD,BOOL); WNDPROC FASTCALL IntGetWindowProc(PWND,BOOL); -#endif /* _WIN32K_WINDOW_H */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/winpos.h b/reactos/subsystems/win32/win32k/include/winpos.h index 513d4d5a035..47f6b389cec 100644 --- a/reactos/subsystems/win32/win32k/include/winpos.h +++ b/reactos/subsystems/win32/win32k/include/winpos.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_WINPOS_H -#define _WIN32K_WINPOS_H +#pragma once /* Undocumented flags. */ #define SWP_NOCLIENTMOVE 0x0800 @@ -37,5 +36,3 @@ VOID FASTCALL co_WinPosActivateOtherWindow(PWINDOW_OBJECT Window); VOID FASTCALL WinPosInitInternalPos(PWINDOW_OBJECT WindowObject, POINT *pt, RECTL *RestoreRect); - -#endif /* _WIN32K_WINPOS_H */ diff --git a/reactos/subsystems/win32/win32k/include/winsta.h b/reactos/subsystems/win32/win32k/include/winsta.h index dfbe717530d..da944af3a46 100644 --- a/reactos/subsystems/win32/win32k/include/winsta.h +++ b/reactos/subsystems/win32/win32k/include/winsta.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_WINSTA_H -#define _WIN32K_WINSTA_H +#pragma once #include "window.h" #include "clipboard.h" @@ -104,6 +103,4 @@ IntGetFullWindowStationName( PWINSTATION_OBJECT FASTCALL IntGetWinStaObj(VOID); -#endif /* _WIN32K_WINSTA_H */ - /* EOF */ diff --git a/reactos/subsystems/win32/win32k/include/xformobj.h b/reactos/subsystems/win32/win32k/include/xformobj.h index 5daf643a69d..d9f05f7214e 100644 --- a/reactos/subsystems/win32/win32k/include/xformobj.h +++ b/reactos/subsystems/win32/win32k/include/xformobj.h @@ -1,5 +1,4 @@ -#ifndef _WIN32K_XFORMOBJ_H_ -#define _WIN32K_XFORMOBJ_H_ +#pragma once ULONG INTERNAL_CALL @@ -27,5 +26,3 @@ INTERNAL_CALL XFORMOBJ_Inverse( OUT XFORMOBJ *pxoDst, IN XFORMOBJ *pxoSrc); - -#endif /* not _WIN32K_XFORMOBJ_H_ */ diff --git a/reactos/tools/buildno/pch.h b/reactos/tools/buildno/pch.h index 16177f82a27..1ffb3dfd38f 100644 --- a/reactos/tools/buildno/pch.h +++ b/reactos/tools/buildno/pch.h @@ -1,7 +1,6 @@ // pre-compiled header stuff -#ifndef PCH_H -#define PCH_H +#pragma once #ifdef _MSC_VER #pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information @@ -43,5 +42,3 @@ inline char * strlwr(char *x) #define MAX_PATH PATH_MAX #define _MAX_PATH PATH_MAX #endif - -#endif//PCH_H diff --git a/reactos/tools/cabman/cabinet.h b/reactos/tools/cabman/cabinet.h index 418308492fd..f6175af5cc1 100755 --- a/reactos/tools/cabman/cabinet.h +++ b/reactos/tools/cabman/cabinet.h @@ -4,8 +4,8 @@ * FILE: tools/cabman/cabinet.h * PURPOSE: Cabinet definitions */ -#ifndef __CABINET_H -#define __CABINET_H + +#pragma once #if defined(WIN32) #include @@ -496,6 +496,4 @@ private: #endif /* CAB_READ_ONLY */ }; -#endif /* __CABINET_H */ - /* EOF */ diff --git a/reactos/tools/cabman/cabman.h b/reactos/tools/cabman/cabman.h index ed7be30a8bb..0c887cb0daf 100755 --- a/reactos/tools/cabman/cabman.h +++ b/reactos/tools/cabman/cabman.h @@ -4,8 +4,8 @@ * FILE: tools/cabman/cabman.h * PURPOSE: Cabinet manager header */ -#ifndef __CABMAN_H -#define __CABMAN_H + +#pragma once #include "cabinet.h" #include "dfp.h" @@ -41,6 +41,4 @@ private: char FileName[MAX_PATH]; }; -#endif /* __CABMAN_H */ - /* EOF */ diff --git a/reactos/tools/cabman/dfp.h b/reactos/tools/cabman/dfp.h index 4c94fd34f1e..bf50caac230 100755 --- a/reactos/tools/cabman/dfp.h +++ b/reactos/tools/cabman/dfp.h @@ -4,8 +4,8 @@ * FILE: tools/cabman/dfp.h * PURPOSE: Directive file parser header */ -#ifndef __DFP_H -#define __DFP_H + +#pragma once #include "cabinet.h" @@ -138,6 +138,4 @@ private: bool InfModeEnabled; }; -#endif /* __DFP_H */ - /* EOF */ diff --git a/reactos/tools/cabman/mszip.h b/reactos/tools/cabman/mszip.h index ebe83fccae7..da5c59f0a8e 100755 --- a/reactos/tools/cabman/mszip.h +++ b/reactos/tools/cabman/mszip.h @@ -4,8 +4,8 @@ * FILE: tools/cabman/mszip.h * PURPOSE: CAB codec for MSZIP compressed data */ -#ifndef __MSZIP_H -#define __MSZIP_H + +#pragma once #include "cabinet.h" #include @@ -36,6 +36,4 @@ private: z_stream ZStream; /* Zlib stream */ }; -#endif /* __MSZIP_H */ - /* EOF */ diff --git a/reactos/tools/cabman/raw.h b/reactos/tools/cabman/raw.h index 635712f3a9d..0b79efb7cd9 100755 --- a/reactos/tools/cabman/raw.h +++ b/reactos/tools/cabman/raw.h @@ -4,8 +4,8 @@ * FILE: tools/cabman/raw.h * PURPOSE: CAB codec for uncompressed data */ -#ifndef __RAW_H -#define __RAW_H + +#pragma once #include "cabinet.h" @@ -30,6 +30,4 @@ public: PULONG OutputLength); }; -#endif /* __RAW_H */ - /* EOF */ diff --git a/reactos/tools/log2lines/cache.h b/reactos/tools/log2lines/cache.h index b33e5f9b4b5..e34290fabae 100644 --- a/reactos/tools/log2lines/cache.h +++ b/reactos/tools/log2lines/cache.h @@ -5,13 +5,10 @@ * - Image directory caching */ -#ifndef __L2L_CACHE_H__ -#define __L2L_CACHE_H__ +#pragma once int check_directory(int force); int read_cache(void); int create_cache(int force, int skipImageBase); -#endif /* __L2L_CACHE_H__ */ - /* EOF */ diff --git a/reactos/tools/log2lines/cmd.h b/reactos/tools/log2lines/cmd.h index c6b7d052043..c2380b2b894 100644 --- a/reactos/tools/log2lines/cmd.h +++ b/reactos/tools/log2lines/cmd.h @@ -5,8 +5,7 @@ * - Cli for escape commands */ -#ifndef __L2L_CMD_H__ -#define __L2L_CMD_H__ +#pragma once #include @@ -21,6 +20,4 @@ char handle_escape_cmd(FILE *outFile, char *Line, char *path, char *LineOut); -#endif /* __L2L_CMD_H__ */ - /* EOF */ diff --git a/reactos/tools/log2lines/compat.h b/reactos/tools/log2lines/compat.h index 76d87681ce0..1b364db725b 100644 --- a/reactos/tools/log2lines/compat.h +++ b/reactos/tools/log2lines/compat.h @@ -1,5 +1,4 @@ -#ifndef __L2L_COMPAT_H__ -#define __L2L_COMPAT_H__ +#pragma once #if defined (__DJGPP__) || defined (__WIN32__) @@ -35,7 +34,4 @@ #endif /* not defined (__DJGPP__) || defined (__WIN32__) */ - -#endif /* __L2L_COMPAT_H__ */ - /* EOF */ diff --git a/reactos/tools/log2lines/config.h b/reactos/tools/log2lines/config.h index c1a29d22f9c..d39c646a3d9 100644 --- a/reactos/tools/log2lines/config.h +++ b/reactos/tools/log2lines/config.h @@ -1,5 +1,4 @@ -#ifndef __L2L_CONFIG_H__ -#define __L2L_CONFIG_H__ +#pragma once /* Assume if an offset > ABS_TRESHOLD, then it must be absolute */ #define ABS_TRESHOLD 0x00400000L @@ -30,6 +29,4 @@ PATH_STR "reactos" PATH_STR "reactos > " DEV_NULL #define LINESIZE 1024 #define NAMESIZE 80 -#endif /* __L2L_CONFIG_H__ */ - /* EOF */ diff --git a/reactos/tools/log2lines/help.h b/reactos/tools/log2lines/help.h index 5f2ab3893da..9f08f57897f 100644 --- a/reactos/tools/log2lines/help.h +++ b/reactos/tools/log2lines/help.h @@ -5,13 +5,10 @@ * - Help text and functions */ -#ifndef __L2L_HELP_H__ -#define __L2L_HELP_H__ +#pragma once extern char *verboseUsage; void usage(int verbose); -#endif /* __L2L_HELP_H__ */ - /* EOF */ diff --git a/reactos/tools/log2lines/image.h b/reactos/tools/log2lines/image.h index acc6712e695..f9371e0c0eb 100644 --- a/reactos/tools/log2lines/image.h +++ b/reactos/tools/log2lines/image.h @@ -5,8 +5,7 @@ * - Image functions for symbol info */ -#ifndef __L2L_IMAGE_H__ -#define __L2L_IMAGE_H__ +#pragma once #include @@ -18,7 +17,4 @@ PIMAGE_SECTION_HEADER get_sectionheader(const void *FileData); int get_ImageBase(char *fname, size_t *ImageBase); - -#endif /* __L2L_IMAGE_H__ */ - /* EOF */ diff --git a/reactos/tools/log2lines/list.h b/reactos/tools/log2lines/list.h index e23fbc48cbe..4406a41be8f 100644 --- a/reactos/tools/log2lines/list.h +++ b/reactos/tools/log2lines/list.h @@ -1,5 +1,4 @@ -#ifndef __L2L_LIST_H__ -#define __L2L_LIST_H__ +#pragma once typedef struct entry_struct { @@ -23,6 +22,4 @@ PLIST_MEMBER cache_entry_create(char *Line); PLIST_MEMBER sources_entry_create(PLIST list, char *path, char *prefix); void list_clear(PLIST list); -#endif /* __L2L_LIST_H__ */ - /* EOF */ diff --git a/reactos/tools/log2lines/log2lines.h b/reactos/tools/log2lines/log2lines.h index 5d4059f2145..f7fd9ff8e87 100644 --- a/reactos/tools/log2lines/log2lines.h +++ b/reactos/tools/log2lines/log2lines.h @@ -1,5 +1,4 @@ -#ifndef __LOG2LINES_H__ -#define __LOG2LINES_H__ +#pragma once #include #include @@ -30,6 +29,4 @@ extern FILE *logFile; extern LINEINFO lastLine; extern LIST sources; -#endif /* __LOG2LINES_H__ */ - /* EOF */ diff --git a/reactos/tools/log2lines/options.h b/reactos/tools/log2lines/options.h index 8051eaa9880..87b6cd0f321 100644 --- a/reactos/tools/log2lines/options.h +++ b/reactos/tools/log2lines/options.h @@ -5,8 +5,7 @@ * - Option parsing */ -#ifndef __L2L_OPTIONS_H__ -#define __L2L_OPTIONS_H__ +#pragma once extern char *optchars; extern int opt_buffered; // -b @@ -39,6 +38,4 @@ extern char opt_SourcesPath[]; //sources path int optionInit(int argc, const char **argv); int optionParse(int argc, const char **argv); -#endif /* __L2L_OPTIONS_H__ */ - /* EOF */ diff --git a/reactos/tools/log2lines/revision.h b/reactos/tools/log2lines/revision.h index 7a43be9b77a..6da59ad03e3 100644 --- a/reactos/tools/log2lines/revision.h +++ b/reactos/tools/log2lines/revision.h @@ -5,8 +5,7 @@ * - SVN interface and revision analysis */ -#ifndef __L2L_REVISION_H__ -#define __L2L_REVISION_H__ +#pragma once #include @@ -25,6 +24,4 @@ unsigned long findRev(FILE *finx, int *rev); int regscan(FILE *outFile); int updateSvnlog(void); -#endif /* __L2L_REVISION_H__ */ - /* EOF */ diff --git a/reactos/tools/log2lines/stat.h b/reactos/tools/log2lines/stat.h index 6aced4766cd..2b870285604 100644 --- a/reactos/tools/log2lines/stat.h +++ b/reactos/tools/log2lines/stat.h @@ -5,8 +5,7 @@ * - Statistics */ -#ifndef __L2L_STAT_H__ -#define __L2L_STAT_H__ +#pragma once #include @@ -27,6 +26,4 @@ typedef struct summ_struct void stat_print(FILE *outFile, PSUMM psumm); void stat_clear(PSUMM psumm); -#endif /* __L2L_STAT_H__ */ - /* EOF */ diff --git a/reactos/tools/log2lines/util.h b/reactos/tools/log2lines/util.h index b4736f598f0..afb5dcfb116 100644 --- a/reactos/tools/log2lines/util.h +++ b/reactos/tools/log2lines/util.h @@ -5,8 +5,7 @@ * - Misc utils */ -#ifndef __L2L_UTIL_H__ -#define __L2L_UTIL_H__ +#pragma once #include @@ -47,6 +46,4 @@ int isOffset(const char *a); int copy_file(char *src, char *dst); int set_LogFile(FILE *logFile); -#endif /* __L2L_UTIL_H__ */ - /* EOF */ diff --git a/reactos/tools/log2lines/version.h b/reactos/tools/log2lines/version.h index 9a42e4904a3..1222b4f56da 100644 --- a/reactos/tools/log2lines/version.h +++ b/reactos/tools/log2lines/version.h @@ -5,11 +5,8 @@ * - Version */ -#ifndef __L2L_VERSION_H__ -#define __L2L_VERSION_H__ +#pragma once #define LOG2LINES_VERSION "2.1" -#endif /* __L2L_VERSION_H__ */ - /* EOF */ diff --git a/reactos/tools/mkhive/binhive.h b/reactos/tools/mkhive/binhive.h index 709c93100dd..43becbf9abd 100644 --- a/reactos/tools/mkhive/binhive.h +++ b/reactos/tools/mkhive/binhive.h @@ -23,14 +23,11 @@ * PROGRAMMER: Hervé Poussineau */ -#ifndef __BINHIVE_H__ -#define __BINHIVE_H__ +#pragma once BOOL ExportBinaryHive( IN PCSTR FileName, IN PCMHIVE Hive); -#endif /* __BINHIVE_H__ */ - /* EOF */ diff --git a/reactos/tools/mkhive/mkhive.h b/reactos/tools/mkhive/mkhive.h index b86687c95ee..becb9b31262 100644 --- a/reactos/tools/mkhive/mkhive.h +++ b/reactos/tools/mkhive/mkhive.h @@ -24,8 +24,7 @@ * Hervé Poussineau */ -#ifndef __MKHIVE_H__ -#define __MKHIVE_H__ +#pragma once #include #include @@ -103,6 +102,4 @@ extern LIST_ENTRY CmiHiveListHead; #define GCC_PACKED __attribute__((packed)) #endif//_MSC_VER -#endif /* __MKHIVE_H__ */ - /* EOF */ diff --git a/reactos/tools/mkhive/reginf.h b/reactos/tools/mkhive/reginf.h index f807a65785c..f84f6ed464b 100644 --- a/reactos/tools/mkhive/reginf.h +++ b/reactos/tools/mkhive/reginf.h @@ -23,12 +23,9 @@ * PROGRAMMER: Hervé Poussineau */ -#ifndef __REGINF_H__ -#define __REGINF_H__ +#pragma once BOOL ImportRegistryFile(PCHAR Filename); -#endif /* __REGINF_H__ */ - /* EOF */ diff --git a/reactos/tools/mkhive/registry.h b/reactos/tools/mkhive/registry.h index a810602a81f..696126bbc1e 100644 --- a/reactos/tools/mkhive/registry.h +++ b/reactos/tools/mkhive/registry.h @@ -4,8 +4,7 @@ * PURPOSE: Registry code */ -#ifndef __REGISTRY_H__ -#define __REGISTRY_H__ +#pragma once typedef struct _REG_VALUE { @@ -122,9 +121,4 @@ RegGetValueCount (HKEY Key); VOID RegInitializeRegistry(VOID); -#endif /* __REGISTRY_H__ */ - /* EOF */ - - - diff --git a/reactos/tools/rbuild/backend/backend.h b/reactos/tools/rbuild/backend/backend.h index 87755e89409..7e9da13ed1d 100644 --- a/reactos/tools/rbuild/backend/backend.h +++ b/reactos/tools/rbuild/backend/backend.h @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __BACKEND_H -#define __BACKEND_H + +#pragma once #include "../rbuild.h" @@ -75,5 +75,3 @@ public: Project& ProjectNode; Configuration& configuration; }; - -#endif /* __BACKEND_H */ diff --git a/reactos/tools/rbuild/backend/codeblocks/codeblocks.h b/reactos/tools/rbuild/backend/codeblocks/codeblocks.h index 3848560f49e..c0d0c26309b 100644 --- a/reactos/tools/rbuild/backend/codeblocks/codeblocks.h +++ b/reactos/tools/rbuild/backend/codeblocks/codeblocks.h @@ -16,8 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __CODEBLOCKS_H__ -#define __CODEBLOCKS_H__ + +#pragma once #include #include @@ -98,7 +98,3 @@ class CBBackend : public Backend bool _copy_file ( const std::string& inputname, const std::string& targetname ) const; const Property* _lookup_property ( const Module& module, const std::string& name ) const; }; - - -#endif // __MSVC_H__ - diff --git a/reactos/tools/rbuild/backend/dependencymap/dependencymap.h b/reactos/tools/rbuild/backend/dependencymap/dependencymap.h index 1610d37a448..96114f514fd 100644 --- a/reactos/tools/rbuild/backend/dependencymap/dependencymap.h +++ b/reactos/tools/rbuild/backend/dependencymap/dependencymap.h @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __DEPMAP_H__ -#define __DEPMAP_H__ + +#pragma once #include #include @@ -62,7 +62,3 @@ class DepMapBackend : public Backend }; }; - - -#endif // __DEPMAP_H__ - diff --git a/reactos/tools/rbuild/backend/mingw/mingw.h b/reactos/tools/rbuild/backend/mingw/mingw.h index c4331b9c152..aebeb57872a 100644 --- a/reactos/tools/rbuild/backend/mingw/mingw.h +++ b/reactos/tools/rbuild/backend/mingw/mingw.h @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MINGW_H -#define MINGW_H + +#pragma once #include "../backend.h" @@ -149,5 +149,3 @@ struct ModuleHandlerInformations }; extern const struct ModuleHandlerInformations ModuleHandlerInformations[]; - -#endif /* MINGW_H */ diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.h b/reactos/tools/rbuild/backend/mingw/modulehandler.h index 797f075812a..b67f63f4b7a 100644 --- a/reactos/tools/rbuild/backend/mingw/modulehandler.h +++ b/reactos/tools/rbuild/backend/mingw/modulehandler.h @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MINGW_MODULEHANDLER_H -#define MINGW_MODULEHANDLER_H + +#pragma once #include "../backend.h" #include "mingw.h" @@ -370,5 +370,3 @@ public: MingwElfExecutableModuleHandler ( const Module& module ); virtual void Process (); }; - -#endif /* MINGW_MODULEHANDLER_H */ diff --git a/reactos/tools/rbuild/backend/mingw/rule.h b/reactos/tools/rbuild/backend/mingw/rule.h index fa56b0d9319..1c9c9a5bf86 100644 --- a/reactos/tools/rbuild/backend/mingw/rule.h +++ b/reactos/tools/rbuild/backend/mingw/rule.h @@ -16,8 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MINGW_RULE_H -#define MINGW_RULE_H +#pragma once #include "mingw.h" @@ -46,5 +45,3 @@ private: const std::string command; string_list generatedFiles; }; - -#endif diff --git a/reactos/tools/rbuild/backend/msbuild/msbuild.h b/reactos/tools/rbuild/backend/msbuild/msbuild.h index 62522789a6e..d1cd1f08fe6 100644 --- a/reactos/tools/rbuild/backend/msbuild/msbuild.h +++ b/reactos/tools/rbuild/backend/msbuild/msbuild.h @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __MSBUILD_H__ -#define __MSBUILD_H__ + +#pragma once #include #include @@ -66,7 +66,3 @@ class MsBuildBackend : public Backend }; }; - - -#endif // __MsBuild_H__ - diff --git a/reactos/tools/rbuild/backend/msvc/msvc.h b/reactos/tools/rbuild/backend/msvc/msvc.h index 4be80c64c99..a917c12e187 100644 --- a/reactos/tools/rbuild/backend/msvc/msvc.h +++ b/reactos/tools/rbuild/backend/msvc/msvc.h @@ -16,8 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __MSVC_H__ -#define __MSVC_H__ + +#pragma once #include #include @@ -253,4 +253,3 @@ class PropsMaker void _generate_footer(); }; -#endif // __MSVC_H__ diff --git a/reactos/tools/rbuild/backend/versionreport/versionreport.h b/reactos/tools/rbuild/backend/versionreport/versionreport.h index 2b677b8e5b7..24d4addefb1 100644 --- a/reactos/tools/rbuild/backend/versionreport/versionreport.h +++ b/reactos/tools/rbuild/backend/versionreport/versionreport.h @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __VREPORT_H__ -#define __VREPORT_H__ + +#pragma once #include #include @@ -63,6 +63,3 @@ class VReportBackend : public Backend }; }; - - -#endif // __VREPORT_H__ diff --git a/reactos/tools/rbuild/exception.h b/reactos/tools/rbuild/exception.h index 9adde7d7cc2..c09528553f5 100644 --- a/reactos/tools/rbuild/exception.h +++ b/reactos/tools/rbuild/exception.h @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __EXCEPTION_H -#define __EXCEPTION_H + +#pragma once #include "pch.h" #include "xml.h" @@ -144,5 +144,3 @@ public: std::string BuildTool; std::string Version; }; - -#endif /* __EXCEPTION_H */ diff --git a/reactos/tools/rbuild/pch.h b/reactos/tools/rbuild/pch.h index 298699e45bc..e98342b1b8b 100644 --- a/reactos/tools/rbuild/pch.h +++ b/reactos/tools/rbuild/pch.h @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef PCH_H -#define PCH_H + +#pragma once #ifdef _MSC_VER #pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information @@ -79,5 +79,3 @@ inline char *strupr(char *x) #define MAX_PATH PATH_MAX #define _MAX_PATH PATH_MAX #endif - -#endif//PCH_H diff --git a/reactos/tools/rbuild/rbuild.h b/reactos/tools/rbuild/rbuild.h index 3635cea4d43..fe2aca15d96 100644 --- a/reactos/tools/rbuild/rbuild.h +++ b/reactos/tools/rbuild/rbuild.h @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __RBUILD_H -#define __RBUILD_H + +#pragma once #include "pch.h" @@ -1095,5 +1095,3 @@ NormalizeFilename ( const std::string& filename ); extern std::string ToLower ( std::string filename ); - -#endif /* __RBUILD_H */ diff --git a/reactos/tools/rbuild/test.h b/reactos/tools/rbuild/test.h index fd9cdfca32f..69e131f44ed 100644 --- a/reactos/tools/rbuild/test.h +++ b/reactos/tools/rbuild/test.h @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TEST_H -#define __TEST_H + +#pragma once #include "rbuild.h" #include "backend/mingw/mingw.h" @@ -160,5 +160,3 @@ class CompilationUnitTest : public BaseTest public: void Run (); }; - -#endif /* __TEST_H */ diff --git a/reactos/tools/rsym/dwarf2.h b/reactos/tools/rsym/dwarf2.h index ce9a993872f..f07054d6ebc 100644 --- a/reactos/tools/rsym/dwarf2.h +++ b/reactos/tools/rsym/dwarf2.h @@ -38,8 +38,7 @@ /* This file is shared between GCC and GDB, and should not contain prototypes. */ -#ifndef GCC_DWARF2_H -#define GCC_DWARF2_H +#pragma once //#include "list.h" @@ -838,7 +837,3 @@ typedef struct _CFSTATE } DW2CFSTATE, *PDW2CFSTATE; #define NextCIE(p) ((void*)((char*)p + p->Length + 4)) - - - -#endif /* dwarf2.h */ diff --git a/reactos/tools/rsym/rsym.h b/reactos/tools/rsym/rsym.h index cae80e7c69a..386b064b4a4 100644 --- a/reactos/tools/rsym/rsym.h +++ b/reactos/tools/rsym/rsym.h @@ -1,7 +1,6 @@ /* rsym.h */ -#ifndef RSYM_H -#define RSYM_H +#pragma once #define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x010b #define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x020b @@ -373,5 +372,3 @@ convert_path(const char* origpath); extern void* load_file ( const char* file_name, size_t* file_size ); - -#endif/*RSYM_H*/ diff --git a/reactos/tools/rsym/rsym64.h b/reactos/tools/rsym/rsym64.h index 521b55cbad9..057fbb302bc 100644 --- a/reactos/tools/rsym/rsym64.h +++ b/reactos/tools/rsym/rsym64.h @@ -1,6 +1,4 @@ - -#ifndef _RSYM64_H -#define _RSYM64_H +#pragma once //C_ASSERT(sizeof(ULONG) == 4); typedef unsigned char UBYTE; @@ -179,7 +177,3 @@ typedef struct ULONG cScopes; } FILE_INFO, *PFILE_INFO; - - - -#endif // !_RSYM64_H diff --git a/reactos/tools/ssprintf.h b/reactos/tools/ssprintf.h index 888e67894d5..6e105542be0 100644 --- a/reactos/tools/ssprintf.h +++ b/reactos/tools/ssprintf.h @@ -13,8 +13,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef SSPRINTF_H -#define SSPRINTF_H + +#pragma once #include #include @@ -38,5 +38,3 @@ std::wstring sswvprintf ( const wchar_t* fmt, va_list args ); #define sstprintf ssprintf #define sstvprintf ssvprintf #endif - -#endif diff --git a/reactos/tools/xml.h b/reactos/tools/xml.h index 5bd8ffade8b..03d11724c89 100644 --- a/reactos/tools/xml.h +++ b/reactos/tools/xml.h @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef XML_H -#define XML_H + +#pragma once #include #include @@ -240,5 +240,3 @@ std::vector vectorize(const std::string &str); void vectappend(std::vector &strvec, char ch); void vectappend(std::vector &strvec, const char *charstr); void vectappend(std::vector &strvec, const std::string &str); - -#endif // XML_H