>From 3601890f4427549add3637d3cebe5a0b71c486a0 Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 04:40:10 +0100
Subject: [PATCH 03/24] WindowMaker: ValidModMask without extern

The ValidModMask definition is now at WindowMaker.h and the extern is not 
needed.
---
 src/WindowMaker.h |    2 +-
 src/main.c        |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 5c34810..b0b728b 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -445,7 +445,7 @@ typedef struct WPreferences {
 
 /****** Global Variables  ******/
 Display        *dpy;
-extern unsigned int ValidModMask;
+unsigned int ValidModMask;
 extern char WProgramState;
 extern char WProgramSigState;
 
diff --git a/src/main.c b/src/main.c
index bc68fb7..04d11cd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -64,8 +64,6 @@
 
 char *ProgName;
 
-unsigned int ValidModMask = 0xff;
-
 #ifdef HAVE_INOTIFY
 int inotifyFD;
 int inotifyWD;
@@ -542,6 +540,8 @@ int main(int argc, char **argv)
        int i_am_the_monitor, i, len;
        char *str, *alt;
 
+       ValidModMask = 0xff;
+
        /* setup common stuff for the monitor and wmaker itself */
        WMInitializeApplication("WindowMaker", &argc, argv);
 
-- 
1.7.2.3

-- 
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From 3601890f4427549add3637d3cebe5a0b71c486a0 Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 04:40:10 +0100
Subject: [PATCH 03/24] WindowMaker: ValidModMask without extern

The ValidModMask definition is now at WindowMaker.h and the extern is not needed.
---
 src/WindowMaker.h |    2 +-
 src/main.c        |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 5c34810..b0b728b 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -445,7 +445,7 @@ typedef struct WPreferences {
 
 /****** Global Variables  ******/
 Display	*dpy;
-extern unsigned int ValidModMask;
+unsigned int ValidModMask;
 extern char WProgramState;
 extern char WProgramSigState;
 
diff --git a/src/main.c b/src/main.c
index bc68fb7..04d11cd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -64,8 +64,6 @@
 
 char *ProgName;
 
-unsigned int ValidModMask = 0xff;
-
 #ifdef HAVE_INOTIFY
 int inotifyFD;
 int inotifyWD;
@@ -542,6 +540,8 @@ int main(int argc, char **argv)
 	int i_am_the_monitor, i, len;
 	char *str, *alt;
 
+	ValidModMask = 0xff;
+
 	/* setup common stuff for the monitor and wmaker itself */
 	WMInitializeApplication("WindowMaker", &argc, argv);
 
-- 
1.7.2.3

Reply via email to