[PATCH 12/24] WindowMaker: KEEP_XKB_LOCK_STATUS variables moved to WindowMaker.h

Thu, 26 Jan 2012 15:43:31 -0800 

>From 8f96129c0eb92102cc4879f20a743c4f736b1a29 Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 06:33:18 +0100
Subject: [PATCH 12/24] WindowMaker: KEEP_XKB_LOCK_STATUS variables moved to 
WindowMaker.h

The variables used for keep xkb lock status are moved to WindowMaker.h and now 
are not extern.
---
 src/WindowMaker.h |    7 +++++--
 src/event.c       |    4 ----
 src/main.c        |    5 -----
 src/screen.c      |    3 ---
 src/startup.c     |    5 -----
 5 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index de5b411..17f98b9 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -295,8 +295,6 @@ enum {
     WColorSettings = 1 << 2
 };
 
-
-
 typedef struct {
     int x1, y1;
     int x2, y2;
@@ -449,6 +447,11 @@ unsigned int ValidModMask;
 char WProgramState;
 char WProgramSigState;
 
+#ifdef KEEP_XKB_LOCK_STATUS
+Bool wXkbSupported;
+int wXkbEventBase;
+#endif
+
 /****** Notifications ******/
 const char *WMNManaged;
 const char *WMNUnmanaged;
diff --git a/src/event.c b/src/event.c
index 8effde5..a7d6d26 100644
--- a/src/event.c
+++ b/src/event.c
@@ -84,10 +84,6 @@ extern Bool wShapeSupported;
 extern int wShapeEventBase;
 #endif
 
-#ifdef KEEP_XKB_LOCK_STATUS
-extern int wXkbEventBase;
-#endif
-
 #ifdef HAVE_XRANDR
 extern Bool has_randr;
 extern int randr_event_base;
diff --git a/src/main.c b/src/main.c
index bd751f0..649e466 100644
--- a/src/main.c
+++ b/src/main.c
@@ -100,11 +100,6 @@ Bool wShapeSupported;
 int wShapeEventBase;
 #endif
 
-#ifdef KEEP_XKB_LOCK_STATUS
-Bool wXkbSupported;
-int wXkbEventBase;
-#endif
-
 #ifdef HAVE_XRANDR
 Bool has_randr;
 int randr_event_base;
diff --git a/src/screen.c b/src/screen.c
index 6e37d68..4bad564 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -71,9 +71,6 @@
 /**** Global variables ****/
 extern int wScreenCount;
 
-#ifdef KEEP_XKB_LOCK_STATUS
-extern int wXkbSupported;
-#endif
 #ifdef HAVE_XRANDR
 extern int has_randr;
 #endif
diff --git a/src/startup.c b/src/startup.c
index d307ee3..53cd208 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -94,11 +94,6 @@ extern Bool wShapeSupported;
 extern int wShapeEventBase;
 #endif
 
-#ifdef KEEP_XKB_LOCK_STATUS
-extern Bool wXkbSupported;
-extern int wXkbEventBase;
-#endif
-
 #ifdef HAVE_XRANDR
 extern Bool has_randr;
 extern int randr_event_base;
-- 
1.7.2.3

-- 
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/

>From 8f96129c0eb92102cc4879f20a743c4f736b1a29 Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 06:33:18 +0100
Subject: [PATCH 12/24] WindowMaker: KEEP_XKB_LOCK_STATUS variables moved to WindowMaker.h

The variables used for keep xkb lock status are moved to WindowMaker.h and now are not extern.
---
 src/WindowMaker.h |    7 +++++--
 src/event.c       |    4 ----
 src/main.c        |    5 -----
 src/screen.c      |    3 ---
 src/startup.c     |    5 -----
 5 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index de5b411..17f98b9 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -295,8 +295,6 @@ enum {
     WColorSettings = 1 << 2
 };
 
-
-
 typedef struct {
     int x1, y1;
     int x2, y2;
@@ -449,6 +447,11 @@ unsigned int ValidModMask;
 char WProgramState;
 char WProgramSigState;
 
+#ifdef KEEP_XKB_LOCK_STATUS
+Bool wXkbSupported;
+int wXkbEventBase;
+#endif
+
 /****** Notifications ******/
 const char *WMNManaged;
 const char *WMNUnmanaged;
diff --git a/src/event.c b/src/event.c
index 8effde5..a7d6d26 100644
--- a/src/event.c
+++ b/src/event.c
@@ -84,10 +84,6 @@ extern Bool wShapeSupported;
 extern int wShapeEventBase;
 #endif
 
-#ifdef KEEP_XKB_LOCK_STATUS
-extern int wXkbEventBase;
-#endif
-
 #ifdef HAVE_XRANDR
 extern Bool has_randr;
 extern int randr_event_base;
diff --git a/src/main.c b/src/main.c
index bd751f0..649e466 100644
--- a/src/main.c
+++ b/src/main.c
@@ -100,11 +100,6 @@ Bool wShapeSupported;
 int wShapeEventBase;
 #endif
 
-#ifdef KEEP_XKB_LOCK_STATUS
-Bool wXkbSupported;
-int wXkbEventBase;
-#endif
-
 #ifdef HAVE_XRANDR
 Bool has_randr;
 int randr_event_base;
diff --git a/src/screen.c b/src/screen.c
index 6e37d68..4bad564 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -71,9 +71,6 @@
 /**** Global variables ****/
 extern int wScreenCount;
 
-#ifdef KEEP_XKB_LOCK_STATUS
-extern int wXkbSupported;
-#endif
 #ifdef HAVE_XRANDR
 extern int has_randr;
 #endif
diff --git a/src/startup.c b/src/startup.c
index d307ee3..53cd208 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -94,11 +94,6 @@ extern Bool wShapeSupported;
 extern int wShapeEventBase;
 #endif
 
-#ifdef KEEP_XKB_LOCK_STATUS
-extern Bool wXkbSupported;
-extern int wXkbEventBase;
-#endif
-
 #ifdef HAVE_XRANDR
 extern Bool has_randr;
 extern int randr_event_base;
-- 
1.7.2.3

Reply via email to