>From ba972b7a948a5dac80f60473ddd803f67c6def0d Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 05:07:21 +0100
Subject: [PATCH 07/24] WindowMaker: wAbort function declared in main.h
The function wAbort is moved to main.h (new file) and removed as extern in
WindowMaker.h.
---
src/Makefile.am | 1 +
src/WindowMaker.h | 7 -------
src/main.c | 1 +
src/main.h | 1 +
src/screen.c | 1 +
src/startup.c | 1 +
6 files changed, 5 insertions(+), 7 deletions(-)
create mode 100644 src/main.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 0521d11..6d2729c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,6 +42,7 @@ wmaker_SOURCES = \
icon.h \
keybind.h \
main.c \
+ main.h \
menu.c \
menu.h \
misc.c \
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 78c8cbf..a50b16f 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -441,19 +441,12 @@ typedef struct WPreferences {
} flags; /* internal flags */
} WPreferences;
-
-
/****** Global Variables ******/
Display *dpy;
unsigned int ValidModMask;
char WProgramState;
char WProgramSigState;
-
-/****** Global Functions ******/
-extern void wAbort(Bool dumpCore);
-
-
/****** Notifications ******/
const char *WMNManaged;
const char *WMNUnmanaged;
diff --git a/src/main.c b/src/main.c
index d028045..48c7040 100644
--- a/src/main.c
+++ b/src/main.c
@@ -43,6 +43,7 @@
#define MAINFILE
+#include "main.h"
#include "WindowMaker.h"
#include "window.h"
#include "funcs.h"
diff --git a/src/main.h b/src/main.h
new file mode 100644
index 0000000..9ef4232
--- /dev/null
+++ b/src/main.h
@@ -0,0 +1 @@
+void wAbort(Bool dumpCore);
diff --git a/src/screen.c b/src/screen.c
index e2cda33..3bf9d25 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -61,6 +61,7 @@
#include <WINGs/WUtil.h>
#include "defaults.h"
+#include "main.h"
#define EVENT_MASK (LeaveWindowMask|EnterWindowMask|PropertyChangeMask\
|SubstructureNotifyMask|PointerMotionMask \
diff --git a/src/startup.c b/src/startup.c
index 149147c..bceda56 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -70,6 +70,7 @@
#endif
#include "xutil.h"
+#include "main.h"
/* for SunOS */
#ifndef SA_RESTART
--
1.7.2.3
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From ba972b7a948a5dac80f60473ddd803f67c6def0d Mon Sep 17 00:00:00 2001
From: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed, 25 Jan 2012 05:07:21 +0100
Subject: [PATCH 07/24] WindowMaker: wAbort function declared in main.h
The function wAbort is moved to main.h (new file) and removed as extern in WindowMaker.h.
---
src/Makefile.am | 1 +
src/WindowMaker.h | 7 -------
src/main.c | 1 +
src/main.h | 1 +
src/screen.c | 1 +
src/startup.c | 1 +
6 files changed, 5 insertions(+), 7 deletions(-)
create mode 100644 src/main.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 0521d11..6d2729c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,6 +42,7 @@ wmaker_SOURCES = \
icon.h \
keybind.h \
main.c \
+ main.h \
menu.c \
menu.h \
misc.c \
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 78c8cbf..a50b16f 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -441,19 +441,12 @@ typedef struct WPreferences {
} flags; /* internal flags */
} WPreferences;
-
-
/****** Global Variables ******/
Display *dpy;
unsigned int ValidModMask;
char WProgramState;
char WProgramSigState;
-
-/****** Global Functions ******/
-extern void wAbort(Bool dumpCore);
-
-
/****** Notifications ******/
const char *WMNManaged;
const char *WMNUnmanaged;
diff --git a/src/main.c b/src/main.c
index d028045..48c7040 100644
--- a/src/main.c
+++ b/src/main.c
@@ -43,6 +43,7 @@
#define MAINFILE
+#include "main.h"
#include "WindowMaker.h"
#include "window.h"
#include "funcs.h"
diff --git a/src/main.h b/src/main.h
new file mode 100644
index 0000000..9ef4232
--- /dev/null
+++ b/src/main.h
@@ -0,0 +1 @@
+void wAbort(Bool dumpCore);
diff --git a/src/screen.c b/src/screen.c
index e2cda33..3bf9d25 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -61,6 +61,7 @@
#include <WINGs/WUtil.h>
#include "defaults.h"
+#include "main.h"
#define EVENT_MASK (LeaveWindowMask|EnterWindowMask|PropertyChangeMask\
|SubstructureNotifyMask|PointerMotionMask \
diff --git a/src/startup.c b/src/startup.c
index 149147c..bceda56 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -70,6 +70,7 @@
#endif
#include "xutil.h"
+#include "main.h"
/* for SunOS */
#ifndef SA_RESTART
--
1.7.2.3
