[PATCH 01/24] WindowMaker: Display dpy externs removed

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

>From b99540302d4c8be6cd39629a2ac0938a471eaaac Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 02:21:18 +0100
Subject: [PATCH 01/24] WindowMaker: Display dpy externs removed

The Display variable dpy is moved to WindowMaker.h, therefore the externs can 
be removed.
---
 src/WindowMaker.h |    2 +-
 src/main.c        |    2 --
 src/xmodifier.c   |    3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 9e2c5f4..47e60f8 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -444,7 +444,7 @@ typedef struct WPreferences {
 
 
 /****** Global Variables  ******/
-extern Display *dpy;
+Display        *dpy;
 extern char *ProgName;
 extern unsigned int ValidModMask;
 extern char WProgramState;
diff --git a/src/main.c b/src/main.c
index c17dcef..bc68fb7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -62,8 +62,6 @@
 
 /* general info */
 
-Display *dpy;
-
 char *ProgName;
 
 unsigned int ValidModMask = 0xff;
diff --git a/src/xmodifier.c b/src/xmodifier.c
index 7bae013..fad72eb 100644
--- a/src/xmodifier.c
+++ b/src/xmodifier.c
@@ -36,8 +36,7 @@ Perpetrator: Sudish Joseph <[email protected]>, Sept. 
1997. */
 
 #include <WINGs/WUtil.h>
 #include "xmodifier.h"
-
-extern Display *dpy;
+#include "WindowMaker.h"
 
 /************************************************************************/
 /*                            keymap handling                           */
-- 
1.7.2.3

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

>From b99540302d4c8be6cd39629a2ac0938a471eaaac Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 02:21:18 +0100
Subject: [PATCH 01/24] WindowMaker: Display dpy externs removed

The Display variable dpy is moved to WindowMaker.h, therefore the externs can be removed.
---
 src/WindowMaker.h |    2 +-
 src/main.c        |    2 --
 src/xmodifier.c   |    3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 9e2c5f4..47e60f8 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -444,7 +444,7 @@ typedef struct WPreferences {
 
 
 /****** Global Variables  ******/
-extern Display	*dpy;
+Display	*dpy;
 extern char *ProgName;
 extern unsigned int ValidModMask;
 extern char WProgramState;
diff --git a/src/main.c b/src/main.c
index c17dcef..bc68fb7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -62,8 +62,6 @@
 
 /* general info */
 
-Display *dpy;
-
 char *ProgName;
 
 unsigned int ValidModMask = 0xff;
diff --git a/src/xmodifier.c b/src/xmodifier.c
index 7bae013..fad72eb 100644
--- a/src/xmodifier.c
+++ b/src/xmodifier.c
@@ -36,8 +36,7 @@ Perpetrator: Sudish Joseph <[email protected]>, Sept. 1997. */
 
 #include <WINGs/WUtil.h>
 #include "xmodifier.h"
-
-extern Display *dpy;
+#include "WindowMaker.h"
 
 /************************************************************************/
 /*                            keymap handling                           */
-- 
1.7.2.3

Reply via email to