From dff565f40105b20b0e8e4dba1f48ccc9b8e7ff44 Mon Sep 17 00:00:00 2001 From: Goraf <22941576+Goraf@users.noreply.github.com> Date: Fri, 23 Feb 2018 22:36:25 +0100 Subject: guard headers --- src/core/stdautoaway/src/stdafx.h | 2 ++ src/core/stdaway/src/stdafx.h | 2 ++ src/core/stdclist/src/clc.h | 2 ++ src/core/stdclist/src/stdafx.h | 2 ++ src/core/stdcrypt/src/stdafx.h | 2 ++ src/core/stdcrypt/src/stdcrypt.h | 2 ++ src/core/stdemail/src/stdafx.h | 2 ++ src/core/stdfile/src/file.h | 2 ++ src/core/stdfile/src/stdafx.h | 2 ++ src/core/stdidle/src/stdafx.h | 2 ++ src/core/stdmsg/src/stdafx.h | 2 ++ src/core/stdssl/src/stdafx.h | 3 +++ src/core/stduihist/src/stdafx.h | 2 ++ src/core/stduserinfo/src/stdafx.h | 2 ++ src/core/stduseronline/src/stdafx.h | 2 ++ src/mir_app/src/FontService.h | 2 ++ src/mir_app/src/IcoLib.h | 2 ++ src/mir_app/src/chat.h | 2 ++ src/mir_app/src/clc.h | 2 ++ src/mir_app/src/database.h | 2 ++ src/mir_app/src/findadd.h | 2 ++ src/mir_app/src/langpack.h | 2 ++ src/mir_app/src/metacontacts.h | 2 ++ src/mir_app/src/miranda.h | 2 ++ src/mir_app/src/netlib.h | 2 ++ src/mir_app/src/plugins.h | 1 + src/mir_app/src/profilemanager.h | 2 ++ src/mir_app/src/skin.h | 2 ++ src/mir_app/src/stdafx.h | 2 ++ src/mir_core/src/miranda.h | 2 ++ src/mir_core/src/stdafx.h | 2 ++ src/miranda32/src/stdafx.h | 2 ++ 32 files changed, 64 insertions(+) (limited to 'src') diff --git a/src/core/stdautoaway/src/stdafx.h b/src/core/stdautoaway/src/stdafx.h index 535e0ae463..da5fa9a4da 100644 --- a/src/core/stdautoaway/src/stdafx.h +++ b/src/core/stdautoaway/src/stdafx.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #include #include #include diff --git a/src/core/stdaway/src/stdafx.h b/src/core/stdaway/src/stdafx.h index 466a47e463..54b57da457 100644 --- a/src/core/stdaway/src/stdafx.h +++ b/src/core/stdaway/src/stdafx.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #include #include #include diff --git a/src/core/stdclist/src/clc.h b/src/core/stdclist/src/clc.h index 6015173f9d..67a0ad228c 100644 --- a/src/core/stdclist/src/clc.h +++ b/src/core/stdclist/src/clc.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #define FONTID_LAST 7 int CompareContacts(const ClcContact *contact1, const ClcContact *contact2); diff --git a/src/core/stdclist/src/stdafx.h b/src/core/stdclist/src/stdafx.h index e484fd22ae..5d0bcd3360 100644 --- a/src/core/stdclist/src/stdafx.h +++ b/src/core/stdclist/src/stdafx.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #include #include #include diff --git a/src/core/stdcrypt/src/stdafx.h b/src/core/stdcrypt/src/stdafx.h index 85daa18616..698d769a89 100644 --- a/src/core/stdcrypt/src/stdafx.h +++ b/src/core/stdcrypt/src/stdafx.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #include #include #include diff --git a/src/core/stdcrypt/src/stdcrypt.h b/src/core/stdcrypt/src/stdcrypt.h index 12efc7b0f5..d2f0990356 100644 --- a/src/core/stdcrypt/src/stdcrypt.h +++ b/src/core/stdcrypt/src/stdcrypt.h @@ -18,6 +18,8 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#pragma once + #include "Rijndael.h" // we use 256-bit keys & 128-bit blocks diff --git a/src/core/stdemail/src/stdafx.h b/src/core/stdemail/src/stdafx.h index 576bd9482d..dc1c4cebfd 100644 --- a/src/core/stdemail/src/stdafx.h +++ b/src/core/stdemail/src/stdafx.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #include #include #include diff --git a/src/core/stdfile/src/file.h b/src/core/stdfile/src/file.h index 96754c0ab8..9a1bd89bcf 100644 --- a/src/core/stdfile/src/file.h +++ b/src/core/stdfile/src/file.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #define VIRUSSCAN_DISABLE 0 #define VIRUSSCAN_AFTERDL 1 #define VIRUSSCAN_DURINGDL 2 diff --git a/src/core/stdfile/src/stdafx.h b/src/core/stdfile/src/stdafx.h index 1611c05c00..f5cfa9be8e 100644 --- a/src/core/stdfile/src/stdafx.h +++ b/src/core/stdfile/src/stdafx.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #include #include #include diff --git a/src/core/stdidle/src/stdafx.h b/src/core/stdidle/src/stdafx.h index 6d7f50aead..7da47bc366 100644 --- a/src/core/stdidle/src/stdafx.h +++ b/src/core/stdidle/src/stdafx.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #include #include #include diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h index 1487d29391..538795fe35 100644 --- a/src/core/stdmsg/src/stdafx.h +++ b/src/core/stdmsg/src/stdafx.h @@ -19,6 +19,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #define WIN32_LEAN_AND_MEAN #include diff --git a/src/core/stdssl/src/stdafx.h b/src/core/stdssl/src/stdafx.h index c9699184e4..93cb948195 100644 --- a/src/core/stdssl/src/stdafx.h +++ b/src/core/stdssl/src/stdafx.h @@ -18,6 +18,9 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#pragma once + #define SECURITY_WIN32 #define HSSL_DEFINED diff --git a/src/core/stduihist/src/stdafx.h b/src/core/stduihist/src/stdafx.h index ad789c95e6..3649a843fc 100644 --- a/src/core/stduihist/src/stdafx.h +++ b/src/core/stduihist/src/stdafx.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #include #include #include diff --git a/src/core/stduserinfo/src/stdafx.h b/src/core/stduserinfo/src/stdafx.h index 5851f96df8..5e4f607a0b 100644 --- a/src/core/stduserinfo/src/stdafx.h +++ b/src/core/stduserinfo/src/stdafx.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #include #include #include diff --git a/src/core/stduseronline/src/stdafx.h b/src/core/stduseronline/src/stdafx.h index 8f7073939f..f47894dc8e 100644 --- a/src/core/stduseronline/src/stdafx.h +++ b/src/core/stduseronline/src/stdafx.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #include #include #include diff --git a/src/mir_app/src/FontService.h b/src/mir_app/src/FontService.h index 0a8b83126f..083c235ffe 100644 --- a/src/mir_app/src/FontService.h +++ b/src/mir_app/src/FontService.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #include "m_fontservice.h" // a font identifier structure - used for registering a font, and getting one out again diff --git a/src/mir_app/src/IcoLib.h b/src/mir_app/src/IcoLib.h index 4e781f21b8..cccd788220 100644 --- a/src/mir_app/src/IcoLib.h +++ b/src/mir_app/src/IcoLib.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #define SECTIONPARAM_MAKE(index, level, flags) MAKELONG((index)&0xFFFF, MAKEWORD(level, flags)) #define SECTIONPARAM_INDEX(lparam) LOWORD(lparam) #define SECTIONPARAM_LEVEL(lparam) LOBYTE(HIWORD(lparam)) diff --git a/src/mir_app/src/chat.h b/src/mir_app/src/chat.h index 2cbaa74569..69ee4bde3e 100644 --- a/src/mir_app/src/chat.h +++ b/src/mir_app/src/chat.h @@ -19,6 +19,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #include #include #include diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h index f13fc2d1ea..4f17a93dc5 100644 --- a/src/mir_app/src/clc.h +++ b/src/mir_app/src/clc.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + struct ClcContact : public ClcContactBase { }; diff --git a/src/mir_app/src/database.h b/src/mir_app/src/database.h index 19e665c127..d5fa61ebf6 100644 --- a/src/mir_app/src/database.h +++ b/src/mir_app/src/database.h @@ -21,6 +21,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + class MDatabaseCache : public MIDatabaseCache { HANDLE m_hCacheHeap; diff --git a/src/mir_app/src/findadd.h b/src/mir_app/src/findadd.h index 07ecabdbe7..3620a05fc3 100644 --- a/src/mir_app/src/findadd.h +++ b/src/mir_app/src/findadd.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #define PF1_ANYSEARCH (PF1_BASICSEARCH | PF1_EXTSEARCHUI | PF1_SEARCHBYEMAIL | PF1_SEARCHBYNAME | PF1_EXTSEARCH) struct ListSearchResult diff --git a/src/mir_app/src/langpack.h b/src/mir_app/src/langpack.h index 92d60c0fe8..b45a9638b1 100644 --- a/src/mir_app/src/langpack.h +++ b/src/mir_app/src/langpack.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + ///////////////////////////////////////////////////////////////////////////////////////// static INT_PTR srvGetDefaultCodePage(WPARAM, LPARAM); diff --git a/src/mir_app/src/metacontacts.h b/src/mir_app/src/metacontacts.h index bad3f6cbaa..48aaa0f240 100644 --- a/src/mir_app/src/metacontacts.h +++ b/src/mir_app/src/metacontacts.h @@ -20,6 +20,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #define MAX_CONTACTS 20 #define META_FILTER "MetaContactsFilter" diff --git a/src/mir_app/src/miranda.h b/src/mir_app/src/miranda.h index 0e2c27aec4..bb06f8ae02 100644 --- a/src/mir_app/src/miranda.h +++ b/src/mir_app/src/miranda.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + typedef HRESULT (STDAPICALLTYPE *pfnDrawThemeTextEx)(HTHEME, HDC, int, int, LPCWSTR, int, DWORD, LPRECT, const struct _DTTOPTS *); typedef HRESULT (STDAPICALLTYPE *pfnSetWindowThemeAttribute)(HWND, enum WINDOWTHEMEATTRIBUTETYPE, PVOID, DWORD); typedef HRESULT (STDAPICALLTYPE *pfnBufferedPaintInit)(void); diff --git a/src/mir_app/src/netlib.h b/src/mir_app/src/netlib.h index cb0bf84106..e9c20e9042 100644 --- a/src/mir_app/src/netlib.h +++ b/src/mir_app/src/netlib.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #define NLH_INVALID 0 #define NLH_USER 'USER' #define NLH_CONNECTION 'CONN' diff --git a/src/mir_app/src/plugins.h b/src/mir_app/src/plugins.h index 2695a44cf1..f871ef3339 100644 --- a/src/mir_app/src/plugins.h +++ b/src/mir_app/src/plugins.h @@ -1,3 +1,4 @@ +#pragma once // returns true if the API exports were good, otherwise, passed in data is returned #define CHECKAPI_NONE 0 diff --git a/src/mir_app/src/profilemanager.h b/src/mir_app/src/profilemanager.h index 3eb9c2fe4c..da5001b4f5 100644 --- a/src/mir_app/src/profilemanager.h +++ b/src/mir_app/src/profilemanager.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + struct PROFILEMANAGERDATA { wchar_t *ptszProfile; // in/out diff --git a/src/mir_app/src/skin.h b/src/mir_app/src/skin.h index 0ba130ee00..d44b75c3e0 100644 --- a/src/mir_app/src/skin.h +++ b/src/mir_app/src/skin.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #define DBMODULENAME "SkinHotKeys" #define WM_HOTKEYUNREGISTERED (WM_USER+721) diff --git a/src/mir_app/src/stdafx.h b/src/mir_app/src/stdafx.h index e38ca604e6..5c846a3de7 100644 --- a/src/mir_app/src/stdafx.h +++ b/src/mir_app/src/stdafx.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #define _ALPHA_BASE_ 1 // defined for CVS builds #define _ALPHA_FUSE_ 1 // defined for fuse powered core diff --git a/src/mir_core/src/miranda.h b/src/mir_core/src/miranda.h index 9337590baf..adfd3ee846 100644 --- a/src/mir_core/src/miranda.h +++ b/src/mir_core/src/miranda.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + extern "C" { MIR_CORE_DLL(int) Langpack_MarkPluginLoaded(PLUGININFOEX* pInfo); diff --git a/src/mir_core/src/stdafx.h b/src/mir_core/src/stdafx.h index e8be433402..40e75635d6 100644 --- a/src/mir_core/src/stdafx.h +++ b/src/mir_core/src/stdafx.h @@ -22,6 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #define INCL_WINSOCK_API_TYPEDEFS 1 #include diff --git a/src/miranda32/src/stdafx.h b/src/miranda32/src/stdafx.h index 7b18d7b27f..468fcf9da0 100644 --- a/src/miranda32/src/stdafx.h +++ b/src/miranda32/src/stdafx.h @@ -22,4 +22,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#pragma once + #include -- cgit v1.2.3