Fixes for -fno-common beeing the default in clang 11.

ok mortimer@ who came to the same patches.

5 files changed, 12 insertions, 15 deletions

diff --git a/app/fvwm/fvwm/fvwm.h b/app/fvwm/fvwm/fvwm.h
index 78b092234..e1102dea8 100644
--- a/app/fvwm/fvwm/fvwm.h
+++ b/app/fvwm/fvwm/fvwm.h
@@ -368,7 +368,7 @@ extern XContext FvwmContext;
 
 extern Window BlackoutWin;
 
-Bool fFvwmInStartup;
+extern Bool fFvwmInStartup;
 
 extern Boolean ShapesSupported;
 
diff --git a/app/fvwm/fvwm/modconf.c b/app/fvwm/fvwm/modconf.c
index 5458171d2..4246183f9 100644
--- a/app/fvwm/fvwm/modconf.c
+++ b/app/fvwm/fvwm/modconf.c
@@ -42,7 +42,7 @@
 #include "screen.h"
 #include "module.h"
 
-unsigned long *PipeMask;                /* in module.c */
+extern unsigned long *PipeMask;                /* in module.c */
 
 extern Boolean debugging;
 
diff --git a/app/fvwm/modules/FvwmButtons/FvwmButtons.c b/app/fvwm/modules/FvwmButtons/FvwmButtons.c
index 11e02b4b2..06f943e2e 100644
--- a/app/fvwm/modules/FvwmButtons/FvwmButtons.c
+++ b/app/fvwm/modules/FvwmButtons/FvwmButtons.c
@@ -119,9 +119,6 @@ int x_fd,fd_width;
 char *config_file = NULL;
 
 static Atom _XA_WM_DEL_WIN;
-Atom _XA_WM_PROTOCOLS;
-Atom _XA_WM_NORMAL_HINTS;
-Atom _XA_WM_NAME;
 
 char *iconPath = NULL;
 char *pixmapPath = NULL;
@@ -1238,7 +1235,6 @@ void CreateWindow(button_info *ub,int maxx,int maxy)
 # endif
 
   _XA_WM_DEL_WIN = XInternAtom(Dpy,"WM_DELETE_WINDOW",0);
-  _XA_WM_PROTOCOLS = XInternAtom (Dpy, "WM_PROTOCOLS",0);
 
 # ifdef DEBUG_INIT
   fprintf(stderr,"sizing...");
diff --git a/app/fvwm/modules/FvwmScroll/FvwmScroll.h b/app/fvwm/modules/FvwmScroll/FvwmScroll.h
index 6454259bb..fba6e1a32 100644
--- a/app/fvwm/modules/FvwmScroll/FvwmScroll.h
+++ b/app/fvwm/modules/FvwmScroll/FvwmScroll.h
@@ -1,5 +1,12 @@
 #include "fvwmlib.h"       
 
+extern Display *dpy;
+extern char *MyName;
+extern Window Root;
+extern int screen;
+extern int d_depth;
+extern int x_fd,fd_width;
+
 char *safemalloc(int length);
 void DeadPipe(int nonsense);
 void GetTargetWindow(Window *app_win);
diff --git a/app/fvwm/modules/FvwmScroll/GrabWindow.c b/app/fvwm/modules/FvwmScroll/GrabWindow.c
index 2880bf71d..d76095893 100644
--- a/app/fvwm/modules/FvwmScroll/GrabWindow.c
+++ b/app/fvwm/modules/FvwmScroll/GrabWindow.c
@@ -39,10 +39,8 @@
 #include <X11/Intrinsic.h>
 
 #include "FvwmScroll.h"
-char *MyName;
 
-Display *dpy;			/* which display are we talking to */
-int x_fd,fd_width;
+
 int Width = 300, Height = 300;
 int target_width, target_height;
 int target_x_offset = 0, target_y_offset = 0;
@@ -56,10 +54,6 @@ int Reduction_V = 2;
 #define PAD_WIDTH2 3
 #define PAD_WIDTH3 5
 
-Window Root;
-int screen;
-int d_depth;
-
 Window main_win,holder_win;
 Pixel back_pix, fore_pix, hilite_pix,shadow_pix;
 GC ReliefGC, ShadowGC;
@@ -69,8 +63,8 @@ extern char *BackColor;
 		     ButtonPressMask | ButtonMotionMask | FocusChangeMask)
 
 Atom wm_del_win;
-Atom _XA_WM_PROTOCOLS;
-Atom _XA_WM_COLORMAP_WINDOWS;
+static Atom _XA_WM_PROTOCOLS;
+static Atom _XA_WM_COLORMAP_WINDOWS;
 
 /****************************************************************************
  *