From 1cef020eb322f1bc2978d49ec2d846dd9d1cc15d Mon Sep 17 00:00:00 2001 From: Christophe CURIS Date: Mon, 6 Apr 2015 17:58:10 +0200 Subject: [PATCH] Code refactoring: replaced macro 'MWM_HINTS' by 'USE_MWM_HINTS' for consistency The usual way to define a macro in is to name macro with 'USE_xxx' when they are used to enable a feature 'xxx'. Signed-off-by: Christophe CURIS --- src/dialog.c | 2 +- src/motif.c | 4 ++-- src/wconfig.h.in | 2 +- src/window.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dialog.c b/src/dialog.c index 6bb34246..25c321ec 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -1312,7 +1312,7 @@ void wShowInfoPanel(WScreen *scr) strbuf = wstrappend(strbuf, _("\nAdditional support for: ")); strbuf = wstrappend(strbuf, "WMSPEC"); -#ifdef MWM_HINTS +#ifdef USE_MWM_HINTS strbuf = wstrappend(strbuf, ", MWM"); #endif diff --git a/src/motif.c b/src/motif.c index 7eaba31c..55afdac3 100644 --- a/src/motif.c +++ b/src/motif.c @@ -21,7 +21,7 @@ #include "wconfig.h" -#ifdef MWM_HINTS +#ifdef USE_MWM_HINTS #include #include @@ -201,4 +201,4 @@ void wMWMCheckClientHints(WWindow *wwin) setupMWMHints(wwin, &hints); } -#endif /* MWM_HINTS */ +#endif /* USE_MWM_HINTS */ diff --git a/src/wconfig.h.in b/src/wconfig.h.in index 2930bcb0..49bb11de 100644 --- a/src/wconfig.h.in +++ b/src/wconfig.h.in @@ -37,7 +37,7 @@ #define ANIMATIONS /* support for Motif window manager (mwm) window hints */ -#define MWM_HINTS +#define USE_MWM_HINTS /* * Undefine BALLOON_TEXT if you don't want balloons for showing extra diff --git a/src/window.c b/src/window.c index d46eca34..121cd168 100644 --- a/src/window.c +++ b/src/window.c @@ -65,7 +65,7 @@ #include "winmenu.h" #include "osdep.h" -#ifdef MWM_HINTS +#ifdef USE_MWM_HINTS # include "motif.h" #endif #include "wmspec.h" @@ -343,9 +343,9 @@ void wWindowSetupInitialAttributes(WWindow *wwin, int *level, int *workspace) int tmp_workspace = -1; int tmp_level = INT_MIN; /* INT_MIN is never used by the window levels */ -#ifdef MWM_HINTS +#ifdef USE_MWM_HINTS wMWMCheckClientHints(wwin); -#endif /* MWM_HINTS */ +#endif /* USE_MWM_HINTS */ wNETWMCheckClientHints(wwin, &tmp_level, &tmp_workspace);