From a752fdad02f5eba89c53a53e4a212cf31cbf4670 Mon Sep 17 00:00:00 2001 From: Tim Wiederhake Date: Wed, 27 Dec 2023 23:08:57 +0100 Subject: Fix include guard names Names that begin with an underscore ('_') are reserved. Follow the usual practice of naming the include guard of file "foo.h" "FOO_H", as is already done in "icons.h". Signed-off-by: Tim Wiederhake --- src/add_window.h | 6 +++--- src/events.h | 6 +++--- src/gc.h | 6 +++--- src/iconmgr.h | 6 +++--- src/icons.h | 2 +- src/list.h | 6 +++--- src/menus.h | 6 +++--- src/parse.h | 6 +++--- src/resize.h | 6 +++--- src/screen.h | 6 +++--- src/session.h | 6 +++--- src/twm.h | 6 +++--- src/util.h | 6 +++--- src/version.h | 6 +++--- 14 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/add_window.h b/src/add_window.h index df4e909..c96ce15 100644 --- a/src/add_window.h +++ b/src/add_window.h @@ -57,8 +57,8 @@ in this Software without prior written authorization from The Open Group. * **********************************************************************/ -#ifndef _ADD_WINDOW_ -#define _ADD_WINDOW_ +#ifndef ADD_WINDOW_H +#define ADD_WINDOW_H #include "iconmgr.h" @@ -82,4 +82,4 @@ extern int AddingY; extern int AddingW; extern int AddingH; -#endif /* _ADD_WINDOW_ */ +#endif /* ADD_WINDOW_H */ diff --git a/src/events.h b/src/events.h index 085439f..3778488 100644 --- a/src/events.h +++ b/src/events.h @@ -57,8 +57,8 @@ in this Software without prior written authorization from The Open Group. * ***********************************************************************/ -#ifndef _EVENTS_ -#define _EVENTS_ +#ifndef EVENTS_H +#define EVENTS_H #include "screen.h" #include "twm.h" @@ -127,4 +127,4 @@ extern unsigned int mods_used; extern int MovedFromKeyPress; -#endif /* _EVENTS_ */ +#endif /* EVENTS_H */ diff --git a/src/gc.h b/src/gc.h index 4065ded..6da0ab5 100644 --- a/src/gc.h +++ b/src/gc.h @@ -57,9 +57,9 @@ in this Software without prior written authorization from The Open Group. * **********************************************************************/ -#ifndef _GC_ -#define _GC_ +#ifndef GC_H +#define GC_H extern void CreateGCs(void); -#endif /* _GC_ */ +#endif /* GC_H */ diff --git a/src/iconmgr.h b/src/iconmgr.h index ae9214a..ad61239 100644 --- a/src/iconmgr.h +++ b/src/iconmgr.h @@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group. * ***********************************************************************/ -#ifndef _ICONMGR_ -#define _ICONMGR_ +#ifndef ICONMGR_H +#define ICONMGR_H #include "twm.h" @@ -87,4 +87,4 @@ extern void PackIconManager(IconMgr *ip); extern void RemoveIconManager(TwmWindow *tmp_win); extern void SortIconManager(IconMgr *ip); -#endif /* _ICONMGR_ */ +#endif /* ICONMGR_H */ diff --git a/src/icons.h b/src/icons.h index 4bac87a..5b34e90 100644 --- a/src/icons.h +++ b/src/icons.h @@ -57,4 +57,4 @@ extern void AddIconRegion(char *geom, int grav1, int grav2, int stepx, int stepy); extern void CreateIconWindow(TwmWindow *tmp_win, int def_x, int def_y); -#endif /* ICONS_H */ +#endif /* ICONS_H */ diff --git a/src/list.h b/src/list.h index d9a4acd..68ab374 100644 --- a/src/list.h +++ b/src/list.h @@ -57,8 +57,8 @@ in this Software without prior written authorization from The Open Group. * **********************************************************************/ -#ifndef _LIST_ -#define _LIST_ +#ifndef LIST_H +#define LIST_H #include #include @@ -75,4 +75,4 @@ extern char *LookInList(name_list * list_head, const char *name, XClassHint *class); extern char *LookInNameList(name_list * list_head, const char *name); -#endif /* _LIST_ */ +#endif /* LIST_H */ diff --git a/src/menus.h b/src/menus.h index 0692a27..5e188fc 100644 --- a/src/menus.h +++ b/src/menus.h @@ -57,8 +57,8 @@ in this Software without prior written authorization from The Open Group. * ***********************************************************************/ -#ifndef _MENUS_ -#define _MENUS_ +#ifndef MENUS_H +#define MENUS_H #include "twm.h" @@ -191,4 +191,4 @@ extern void SendDeleteWindowMessage(TwmWindow *tmp, Time timestamp); extern void SendSaveYourselfMessage(TwmWindow *tmp, Time timestamp); extern void SendTakeFocusMessage(TwmWindow *tmp, Time timestamp); -#endif /* _MENUS_ */ +#endif /* MENUS_H */ diff --git a/src/parse.h b/src/parse.h index 0d0500c..a208cc8 100644 --- a/src/parse.h +++ b/src/parse.h @@ -57,8 +57,8 @@ in this Software without prior written authorization from The Open Group. * **********************************************************************/ -#ifndef _PARSE_ -#define _PARSE_ +#ifndef PARSE_H +#define PARSE_H #include "list.h" @@ -149,4 +149,4 @@ extern int mods; #define D_EAST 3 #define D_WEST 4 -#endif /* _PARSE_ */ +#endif /* PARSE_H */ diff --git a/src/resize.h b/src/resize.h index a16a238..5ca8730 100644 --- a/src/resize.h +++ b/src/resize.h @@ -57,8 +57,8 @@ in this Software without prior written authorization from The Open Group. * **********************************************************************/ -#ifndef _RESIZE_ -#define _RESIZE_ +#ifndef RESIZE_H +#define RESIZE_H #include "twm.h" @@ -77,4 +77,4 @@ extern void SetupFrame(TwmWindow *tmp_win, int x, int y, int w, int h, int bw, extern void SetupWindow(TwmWindow *tmp_win, int x, int y, int w, int h, int bw); extern void StartResize(XEvent *evp, TwmWindow *tmp_win, Bool fromtitlebar); -#endif /* _RESIZE_ */ +#endif /* RESIZE_H */ diff --git a/src/screen.h b/src/screen.h index 39603df..403ce18 100644 --- a/src/screen.h +++ b/src/screen.h @@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group. * ***********************************************************************/ -#ifndef _SCREEN_ -#define _SCREEN_ +#ifndef SCREEN_H +#define SCREEN_H #include #include @@ -263,4 +263,4 @@ extern int FirstScreen; /* may eventually want an option for having the PPosition be the initial location for the drag lines */ -#endif /* _SCREEN_ */ +#endif /* SCREEN_H */ diff --git a/src/session.h b/src/session.h index c574a45..a76c52f 100644 --- a/src/session.h +++ b/src/session.h @@ -23,8 +23,8 @@ * dealings in this Software without prior written authorization from the * XFree86 Project. */ -#ifndef _SESSION_H -#define _SESSION_H +#ifndef SESSION_H +#define SESSION_H #include "twm.h" @@ -41,4 +41,4 @@ extern void ReadWinConfigFile(char *filename); extern SmcConn smcConn; -#endif +#endif /* SESSION_H */ diff --git a/src/twm.h b/src/twm.h index 3b0396a..6fb4d6d 100644 --- a/src/twm.h +++ b/src/twm.h @@ -58,8 +58,8 @@ from The Open Group. * 10-Oct-90 David M. Sternlicht Storing saved colors on root ***********************************************************************/ -#ifndef _TWM_ -#define _TWM_ +#ifndef TWM_H +#define TWM_H /* *INDENT-OFF* */ #ifdef HAVE_CONFIG_H @@ -451,4 +451,4 @@ extern int XrandrErrorBase; #define _XA_WM_WINDOW_ROLE TwmAtoms[10] /* *INDENT-ON* */ -#endif /* _TWM_ */ +#endif /* TWM_H */ diff --git a/src/util.h b/src/util.h index 448ed4d..6adeed9 100644 --- a/src/util.h +++ b/src/util.h @@ -57,8 +57,8 @@ in this Software without prior written authorization from The Open Group. * ***********************************************************************/ -#ifndef _UTIL_ -#define _UTIL_ +#ifndef UTIL_H +#define UTIL_H #include "twm.h" @@ -110,4 +110,4 @@ extern int HotX, HotY; #define XkbBI_MajorError 2 #endif -#endif /* _UTIL_ */ +#endif /* UTIL_H */ diff --git a/src/version.h b/src/version.h index 553b613..fb0d2d6 100644 --- a/src/version.h +++ b/src/version.h @@ -57,9 +57,9 @@ in this Software without prior written authorization from The Open Group. * **********************************************************************/ -#ifndef _VERSION_ -#define _VERSION_ +#ifndef VERSION_H +#define VERSION_H extern const char *Version; -#endif /* _VERSION_ */ +#endif /* VERSION_H */ -- cgit v1.2.3