From 558615a8536cfbfc7134868b3f99d768b7a4ffa3 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 30 Oct 2004 05:46:37 +0000 Subject: [PATCH] Changed the order some header files are loaded, as it seems to cause havoc on some platforms --- WINGs/dragcommon.c | 3 ++- WINGs/dragdestination.c | 4 +++- WINGs/dragsource.c | 6 ++++-- WINGs/handlers.c | 3 +-- WINGs/memory.c | 3 +-- WINGs/usleep.c | 2 +- WINGs/wballoon.c | 2 +- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/WINGs/dragcommon.c b/WINGs/dragcommon.c index 4c152c20..61482bc9 100644 --- a/WINGs/dragcommon.c +++ b/WINGs/dragcommon.c @@ -1,4 +1,5 @@ -/* #include */ + + #include "WINGsP.h" #define VERSION_INFO(dragInfo) dragInfo->protocolVersion diff --git a/WINGs/dragdestination.c b/WINGs/dragdestination.c index 03dcd9bd..34f29c4b 100644 --- a/WINGs/dragdestination.c +++ b/WINGs/dragdestination.c @@ -1,5 +1,7 @@ -#include + + #include "WINGsP.h" +#include #define XDND_SOURCE_RESPONSE_MAX_DELAY 3000 diff --git a/WINGs/dragsource.c b/WINGs/dragsource.c index 7614f463..50ecdf06 100644 --- a/WINGs/dragsource.c +++ b/WINGs/dragsource.c @@ -1,4 +1,7 @@ -#include "../src/config.h" + + +#include "wconfig.h" +#include "WINGsP.h" #include #include @@ -6,7 +9,6 @@ #include #endif -#include "WINGsP.h" #define XDND_DESTINATION_RESPONSE_MAX_DELAY 10000 diff --git a/WINGs/handlers.c b/WINGs/handlers.c index f6bb26ee..84978f01 100644 --- a/WINGs/handlers.c +++ b/WINGs/handlers.c @@ -3,10 +3,9 @@ * WINGs internal handlers: timer, idle and input handlers */ +#include "wconfig.h" #include "WINGsP.h" -#include "../src/config.h" - #include #include diff --git a/WINGs/memory.c b/WINGs/memory.c index 2250310c..efd69baf 100644 --- a/WINGs/memory.c +++ b/WINGs/memory.c @@ -19,8 +19,7 @@ */ -#include "../src/config.h" - +#include "wconfig.h" #include "WUtil.h" #include diff --git a/WINGs/usleep.c b/WINGs/usleep.c index 69f5e9df..4d250b30 100644 --- a/WINGs/usleep.c +++ b/WINGs/usleep.c @@ -1,6 +1,6 @@ -#include "../src/config.h" +#include "wconfig.h" #ifdef HAVE_SYS_TIME_H diff --git a/WINGs/wballoon.c b/WINGs/wballoon.c index f6547796..6d5f75f3 100644 --- a/WINGs/wballoon.c +++ b/WINGs/wballoon.c @@ -1,7 +1,7 @@ -#include "../src/config.h" +#include "wconfig.h" #include "WINGsP.h" #ifdef SHAPE -- 2.11.4.GIT