[PATCH 04/24] WindowMaker: WProgramState now is not extern

[Rodolfo kix Garcia]

>From dbcc295560982b0bde04805e172c30de2165e951 Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <k...@kix.es>
Date: Wed, 25 Jan 2012 04:45:16 +0100
Subject: [PATCH 04/24] WindowMaker: WProgramState now is not extern

WProgramState is moved to WindowMaker.h and now is not extern.
---
 src/WindowMaker.h |    2 +-
 src/main.c        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index b0b728b..49ddf80 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -446,7 +446,7 @@ typedef struct WPreferences {
 /****** Global Variables  ******/
 Display        *dpy;
 unsigned int ValidModMask;
-extern char WProgramState;
+char WProgramState;
 extern char WProgramSigState;
 
 
diff --git a/src/main.c b/src/main.c
index 04d11cd..fce01c6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -145,7 +145,6 @@ int randr_event_base;
 
 /* special flags */
 char WProgramSigState = 0;
-char WProgramState = WSTATE_NORMAL;
 char WDelayedActionSet = 0;
 
 /* notifications */
@@ -541,6 +540,7 @@ int main(int argc, char **argv)
        char *str, *alt;
 
        ValidModMask = 0xff;
+       WProgramState = WSTATE_NORMAL;
 
        /* 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 dbcc295560982b0bde04805e172c30de2165e951 Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <k...@kix.es>
Date: Wed, 25 Jan 2012 04:45:16 +0100
Subject: [PATCH 04/24] WindowMaker: WProgramState now is not extern

WProgramState is moved to WindowMaker.h and now is not extern.
---
 src/WindowMaker.h |    2 +-
 src/main.c        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index b0b728b..49ddf80 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -446,7 +446,7 @@ typedef struct WPreferences {
 /****** Global Variables  ******/
 Display	*dpy;
 unsigned int ValidModMask;
-extern char WProgramState;
+char WProgramState;
 extern char WProgramSigState;
 
 
diff --git a/src/main.c b/src/main.c
index 04d11cd..fce01c6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -145,7 +145,6 @@ int randr_event_base;
 
 /* special flags */
 char WProgramSigState = 0;
-char WProgramState = WSTATE_NORMAL;
 char WDelayedActionSet = 0;
 
 /* notifications */
@@ -541,6 +540,7 @@ int main(int argc, char **argv)
 	char *str, *alt;
 
 	ValidModMask = 0xff;
+	WProgramState = WSTATE_NORMAL;
 
 	/* setup common stuff for the monitor and wmaker itself */
 	WMInitializeApplication("WindowMaker", &argc, argv);
-- 
1.7.2.3