funcs.h removed

The file funcs.h is removed. A new file osdep.h is created to hold
the definition for all osdep_*c files.

The files .c has been adjusted to include the right header files,
removing funcs.h, including osdep.h.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>

src/Makefile.am

@@ -41,7 +41,7 @@ wmaker_SOURCES = 	\
 	framewin.h \
 	geomview.c \
 	geomview.h \
-	funcs.h \
+	osdep.h \
 	icon.c \
 	icon.h \
 	keybind.h \

src/application.c

@@ -35,6 +35,7 @@
 #include "properties.h"
 #include "workspace.h"
 #include "dock.h"
+#include "defaults.h"
 
 /******** Global variables ********/
 

src/appmenu.c

@@ -33,7 +33,6 @@
 #include "WindowMaker.h"
 #include "menu.h"
 #include "actions.h"
-#include "funcs.h"
 #include "appmenu.h"
 #include "framewin.h"
 

src/balloon.c

@@ -22,6 +22,7 @@
 
 #ifdef BALLOON_TEXT
 
+#include <stdio.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #ifdef SHAPED_BALLOON
@@ -39,7 +40,6 @@
 #include "framewin.h"
 #include "icon.h"
 #include "appicon.h"
-#include "funcs.h"
 #include "workspace.h"
 #include "balloon.h"
 

src/dialog.c

@@ -51,6 +51,7 @@
 #include "WindowMaker.h"
 #include "GNUstep.h"
 #include "screen.h"
+#include "window.h"
 #include "dialog.h"
 #include "misc.h"
 #include "stacking.h"

src/dock.c

@@ -24,6 +24,7 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>

src/dock.h

@@ -23,10 +23,7 @@
 #ifndef WMDOCK_H_
 #define WMDOCK_H_
 
-
 #include "appicon.h"
-#include "funcs.h"
-
 
 typedef struct WDock {
     WScreen *screen_ptr;

src/dockedapp.c

@@ -25,6 +25,7 @@
 #include <X11/Xutil.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 
 #include "WindowMaker.h"
 #include "window.h"

src/event.h

@@ -22,6 +22,8 @@
 #ifndef WMEVENT_H
 #define WMEVENT_H
 
+typedef void (WDeathHandler)(pid_t pid, unsigned int status, void *cdata);
+
 void EventLoop(void);
 void DispatchEvent(XEvent *event);
 void ProcessPendingEvents(void);

src/framewin.c

@@ -37,6 +37,7 @@
 #include "resources.h"
 #include "screen.h"
 #include "wcore.h"
+#include "window.h"
 #include "framewin.h"
 #include "stacking.h"
 #include "misc.h"

src/icon.h

@@ -24,7 +24,6 @@
 
 #include "wcore.h"
 #include "window.h"
-#include "funcs.h"
 
 #define TILE_NORMAL	0
 #define TILE_CLIP	1

src/main.c

@@ -45,7 +45,7 @@
 
 #include "WindowMaker.h"
 #include "window.h"
-#include "funcs.h"
+#include "defaults.h"
 #include "event.h"
 #include "startup.h"
 #include "menu.h"

src/misc.c

@@ -38,6 +38,7 @@
 #include <WINGs/WUtil.h>
 #include <wraster.h>
 
+#include "window.h"
 #include "misc.h"
 #include "WindowMaker.h"
 #include "GNUstep.h"

src/misc.h

@@ -21,9 +21,10 @@
 #ifndef WMMISC_H_
 #define WMMISC_H_
 
+#include "defaults.h"
+#include "keybind.h"
 #include "appicon.h"
 
-
 Bool wFetchName(Display *dpy, Window win, char **winname);
 Bool wGetIconName(Display *dpy, Window win, char **iconname);
 Bool UpdateDomainFile(WDDomain * domain);

src/monitor.c

@@ -38,7 +38,6 @@
 #include "window.h"
 #include "dialog.h"
 #include "main.h"
-#include "funcs.h"
 
 /****** Global Variables ******/
 extern WPreferences wPreferences;

src/motif.c

@@ -35,7 +35,6 @@
 #include "properties.h"
 #include "icon.h"
 #include "client.h"
-#include "funcs.h"
 #include "motif.h"
 
 /* Motif window hints */

src/moveres.c

@@ -34,7 +34,6 @@
 #include "client.h"
 #include "icon.h"
 #include "dock.h"
-#include "funcs.h"
 #include "actions.h"
 #include "workspace.h"
 #include "placement.h"

src/osdep.h

@@ -18,21 +18,8 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef WMFUNCS_H_
-#define WMFUNCS_H_
-
-#include <sys/types.h>
-#include <stdio.h>
-
-#include "window.h"
-#include "defaults.h"
-#include "keybind.h"
-
-typedef void (WCallBack)(void *cdata);
-typedef void (WDeathHandler)(pid_t pid, unsigned int status, void *cdata);
-
-
-/* ---[ osdep_*.c ]------------------------------------------------------- */
+#ifndef WMOSDEP_H_
+#define WMOSDEP_H_
 
 Bool GetCommandForPid(int pid, char ***argv, int *argc);
 

src/osdep_bsd.c

@@ -32,7 +32,7 @@
 #include <WINGs/WUtil.h>
 
 #include "wconfig.h"
-#include "funcs.h"
+#include "osdep.h"
 
 /*
  * copy argc and argv for an existing process identified by `pid'

src/osdep_darwin.c

@@ -9,7 +9,7 @@
 #include <WINGs/WUtil.h>
 
 #include "wconfig.h"
-#include "funcs.h"
+#include "osdep.h"
 
 /*
  * copy argc and argv for an existing process identified by `pid'

src/osdep_linux.c

@@ -12,7 +12,7 @@
 #include <WINGs/WUtil.h>
 
 #include "wconfig.h"
-#include "funcs.h"
+#include "osdep.h"
 
 
 #define	RETRY( x )	do {				\

src/osdep_stub.c

@@ -4,7 +4,7 @@
 #include <WINGs/WUtil.h>
 
 #include "wconfig.h"
-#include "funcs.h"
+#include "osdep.h"
 
 Bool GetCommandForPid(int pid, char ***argv, int *argc)
 {

src/placement.c

@@ -34,7 +34,6 @@
 #include "icon.h"
 #include "appicon.h"
 #include "actions.h"
-#include "funcs.h"
 #include "application.h"
 #include "dock.h"
 #include "xinerama.h"

src/screen.c

@@ -45,7 +45,7 @@
 #include "texture.h"
 #include "pixmap.h"
 #include "menu.h"
-#include "funcs.h"
+#include "window.h"
 #include "main.h"
 #include "actions.h"
 #include "properties.h"

src/shutdown.c

@@ -30,7 +30,6 @@
 #include "WindowMaker.h"
 #include "window.h"
 #include "client.h"
-#include "funcs.h"
 #include "main.h"
 #include "properties.h"
 #include "session.h"

src/stacking.c

@@ -30,7 +30,6 @@
 #include "WindowMaker.h"
 #include "screen.h"
 #include "window.h"
-#include "funcs.h"
 #include "actions.h"
 #include "properties.h"
 #include "stacking.h"

src/texture.c

@@ -31,6 +31,7 @@
 
 #include "WindowMaker.h"
 #include "texture.h"
+#include "window.h"
 #include "misc.h"
 
 extern WPreferences wPreferences;

src/window.c

@@ -63,6 +63,7 @@
 #include "misc.h"
 #include "startup.h"
 #include "winmenu.h"
+#include "osdep.h"
 
 #ifdef MWM_HINTS
 # include "motif.h"