Hi, we have a problem with the #includes in the WindowMaker source.
To help with this, I created some files. There are at http://www.kix.es/src/wmaker . Please, take a look in the image size first ;-) One is for WPrefs, because is easy and clear. The other one is for src (WindowMaker), but there are many many includes :-(, then I created three different files. For example, for WPrefs, I made two patches. I cannot try the application (I only compile it), but I think that in this case is not needed (see the patches why). See the http://www.kix.es/src/wmaker/WPrefs.png file to see why I did the patches. Enjoy, kix ---8<--- >From 4f5362ab9f76af5051bc4b24d5207ea2579a72b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]> Date: Sat, 21 Jan 2012 13:41:14 +0100 Subject: [PATCH 1/2] WPrefs: Duplicated include for WINGs/WINGs.h The file <WINGs/WINGs.h> is included twice, one in this file and the other through WPrefs.h. For this reason I removed the direct include. --- WPrefs.app/TexturePanel.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/WPrefs.app/TexturePanel.c b/WPrefs.app/TexturePanel.c index ae3ee64..7caadad 100644 --- a/WPrefs.app/TexturePanel.c +++ b/WPrefs.app/TexturePanel.c @@ -25,13 +25,8 @@ #include <string.h> #include <unistd.h> #include <ctype.h> - #include <X11/Xlib.h> - -#include <WINGs/WINGs.h> - #include "WPrefs.h" - #include "TexturePanel.h" #define MAX_SECTION_PARTS 5 -- 1.7.7.3 >From 27ae381995bc12d3a785a0cbfef65504e404d211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]> Date: Sat, 21 Jan 2012 13:49:12 +0100 Subject: [PATCH 2/2] WPrefs: Include ../src/wconfig.h twice. The file ../src/wconfig.h is included twice, then one entry was removed. --- WPrefs.app/WPrefs.h | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h index 9242f10..01a98e9 100644 --- a/WPrefs.app/WPrefs.h +++ b/WPrefs.app/WPrefs.h @@ -34,7 +34,9 @@ #include <WINGs/WINGs.h> -/* For EXTENDED_WINDOWSHORTCUT */ +/* + * Needed for HAVE_LIBINTL_H and for EXTENDED_WINDOWSHORTCUT + */ #include "../src/wconfig.h" /****/ @@ -111,11 +113,5 @@ void AddDeadChildHandler(pid_t pid, void (*handler)(void*), void *data); #define FRAME_LEFT -2 #define FRAME_WIDTH 524 #define FRAME_HEIGHT 235 - -/* - * Needed for HAVE_LIBINTL_H - */ -#include "../src/wconfig.h" - #endif /* WPREFS_H_ */ -- 1.7.7.3
>From 4f5362ab9f76af5051bc4b24d5207ea2579a72b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]> Date: Sat, 21 Jan 2012 13:41:14 +0100 Subject: [PATCH 1/2] WPrefs: Duplicated include for WINGs/WINGs.h The file <WINGs/WINGs.h> is included twice, one in this file and the other through WPrefs.h. For this reason I removed the direct include. --- WPrefs.app/TexturePanel.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/WPrefs.app/TexturePanel.c b/WPrefs.app/TexturePanel.c index ae3ee64..7caadad 100644 --- a/WPrefs.app/TexturePanel.c +++ b/WPrefs.app/TexturePanel.c @@ -25,13 +25,8 @@ #include <string.h> #include <unistd.h> #include <ctype.h> - #include <X11/Xlib.h> - -#include <WINGs/WINGs.h> - #include "WPrefs.h" - #include "TexturePanel.h" #define MAX_SECTION_PARTS 5 -- 1.7.7.3
>From 27ae381995bc12d3a785a0cbfef65504e404d211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]> Date: Sat, 21 Jan 2012 13:49:12 +0100 Subject: [PATCH 2/2] WPrefs: Include ../src/wconfig.h twice. The file ../src/wconfig.h is included twice, then one entry was removed. --- WPrefs.app/WPrefs.h | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h index 9242f10..01a98e9 100644 --- a/WPrefs.app/WPrefs.h +++ b/WPrefs.app/WPrefs.h @@ -34,7 +34,9 @@ #include <WINGs/WINGs.h> -/* For EXTENDED_WINDOWSHORTCUT */ +/* + * Needed for HAVE_LIBINTL_H and for EXTENDED_WINDOWSHORTCUT + */ #include "../src/wconfig.h" /****/ @@ -111,11 +113,5 @@ void AddDeadChildHandler(pid_t pid, void (*handler)(void*), void *data); #define FRAME_LEFT -2 #define FRAME_WIDTH 524 #define FRAME_HEIGHT 235 - -/* - * Needed for HAVE_LIBINTL_H - */ -#include "../src/wconfig.h" - #endif /* WPREFS_H_ */ -- 1.7.7.3
