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/screen.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/screen.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 */ -- cgit v1.2.3 From b8fe4a7270502dd9242bd5585b67f3afbdbbbadb Mon Sep 17 00:00:00 2001 From: Tim Wiederhake Date: Sat, 20 Jan 2024 16:07:00 +0100 Subject: Make MultiScreen a local variable Signed-off-by: Tim Wiederhake --- src/screen.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/screen.h') diff --git a/src/screen.h b/src/screen.h index 403ce18..0cb307e 100644 --- a/src/screen.h +++ b/src/screen.h @@ -251,7 +251,6 @@ typedef struct ScreenInfo { FuncKey FuncKeyRoot; } ScreenInfo; -extern int MultiScreen; extern int NumScreens; extern ScreenInfo **ScreenList; extern ScreenInfo *Scr; -- cgit v1.2.3 From 81cb173c5001f28ad178e9a9f59f521a13e66e92 Mon Sep 17 00:00:00 2001 From: Tim Wiederhake Date: Sat, 20 Jan 2024 16:07:00 +0100 Subject: Make FirstScreen a local variable Signed-off-by: Tim Wiederhake --- src/screen.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/screen.h') diff --git a/src/screen.h b/src/screen.h index 0cb307e..3a1cb52 100644 --- a/src/screen.h +++ b/src/screen.h @@ -254,7 +254,6 @@ typedef struct ScreenInfo { extern int NumScreens; extern ScreenInfo **ScreenList; extern ScreenInfo *Scr; -extern int FirstScreen; #define PPOS_OFF 0 #define PPOS_ON 1 -- cgit v1.2.3 From 878117d8c70564983afddfb2bb26daa71f25b8c1 Mon Sep 17 00:00:00 2001 From: Tim Wiederhake Date: Sat, 30 Dec 2023 20:49:48 +0100 Subject: Rename field 'delete' to 'remove' in TitlebarPixmaps 'delete' is a keyword in c++. Its usage confuses some tools that work with c and c++ source code. Signed-off-by: Tim Wiederhake --- src/screen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/screen.h') diff --git a/src/screen.h b/src/screen.h index 3a1cb52..d8bf996 100644 --- a/src/screen.h +++ b/src/screen.h @@ -56,7 +56,7 @@ typedef struct _TitlebarPixmaps { Pixmap resize; Pixmap question; Pixmap menu; - Pixmap delete; + Pixmap remove; } TitlebarPixmaps; typedef struct ScreenInfo { -- cgit v1.2.3