diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-02-09 14:41:36 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-02-09 14:41:36 +1100 |
| commit | 71368fa9876c672a66cadea6db89a2a6acb44dab (patch) | |
| tree | 628eda2657ebb73c8c5429274994aafc33bfab3f | |
| parent | e529ca0ed34e81f40a1dbe3be4114a4e0ec267d6 (diff) | |
| download | scintilla-mirror-71368fa9876c672a66cadea6db89a2a6acb44dab.tar.gz | |
Backport: Standardise header guard names and use.
Backport of changeset 7981:098231fb9d66.
| -rw-r--r-- | cocoa/QuartzTextLayout.h | 4 | ||||
| -rw-r--r-- | cocoa/QuartzTextStyle.h | 4 | ||||
| -rw-r--r-- | cocoa/QuartzTextStyleAttribute.h | 4 | ||||
| -rw-r--r-- | gtk/ScintillaGTKAccessible.h | 2 | ||||
| -rw-r--r-- | win32/ScintillaWin.h | 5 |
5 files changed, 12 insertions, 7 deletions
diff --git a/cocoa/QuartzTextLayout.h b/cocoa/QuartzTextLayout.h index f2387dd9b..ceeee1270 100644 --- a/cocoa/QuartzTextLayout.h +++ b/cocoa/QuartzTextLayout.h @@ -8,8 +8,8 @@ * */ -#ifndef _QUARTZ_TEXT_LAYOUT_H -#define _QUARTZ_TEXT_LAYOUT_H +#ifndef QUARTZTEXTLAYOUT_H +#define QUARTZTEXTLAYOUT_H #include <Cocoa/Cocoa.h> diff --git a/cocoa/QuartzTextStyle.h b/cocoa/QuartzTextStyle.h index 174149495..b43b3c424 100644 --- a/cocoa/QuartzTextStyle.h +++ b/cocoa/QuartzTextStyle.h @@ -5,8 +5,8 @@ * */ -#ifndef _QUARTZ_TEXT_STYLE_H -#define _QUARTZ_TEXT_STYLE_H +#ifndef QUARTZTEXTSTYLE_H +#define QUARTZTEXTSTYLE_H #include "QuartzTextStyleAttribute.h" diff --git a/cocoa/QuartzTextStyleAttribute.h b/cocoa/QuartzTextStyleAttribute.h index b9698645e..c2818755c 100644 --- a/cocoa/QuartzTextStyleAttribute.h +++ b/cocoa/QuartzTextStyleAttribute.h @@ -9,8 +9,8 @@ */ -#ifndef _QUARTZ_TEXT_STYLE_ATTRIBUTE_H -#define _QUARTZ_TEXT_STYLE_ATTRIBUTE_H +#ifndef QUARTZTEXTSTYLEATTRIBUTE_H +#define QUARTZTEXTSTYLEATTRIBUTE_H class QuartzFont { diff --git a/gtk/ScintillaGTKAccessible.h b/gtk/ScintillaGTKAccessible.h index 264bbae1c..2168d034c 100644 --- a/gtk/ScintillaGTKAccessible.h +++ b/gtk/ScintillaGTKAccessible.h @@ -191,4 +191,4 @@ public: } -#endif /* SCINTILLAGTKACCESSIBLE_H */ +#endif diff --git a/win32/ScintillaWin.h b/win32/ScintillaWin.h index 6d4d2ce26..e7cfc19ff 100644 --- a/win32/ScintillaWin.h +++ b/win32/ScintillaWin.h @@ -5,6 +5,9 @@ // Copyright 1998-2018 by Neil Hodgson <neilh@scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. +#ifndef SCINTILLAWIN_H +#define SCINTILLAWIN_H + class ScintillaWin; namespace Scintilla { @@ -13,3 +16,5 @@ int ResourcesRelease(bool fromDllMain); sptr_t DirectFunction(ScintillaWin *sci, UINT iMessage, uptr_t wParam, sptr_t lParam); } + +#endif |