For historical reason, some functions defined in WINGs.h are actually
compiled into the WUtil.so library. Although it would be better to compile
them in the appropriate library instead (and fix the code accordingly to
make it work), this would break the binary compatibility.
This patch moves the declaration from WINGs.h to the WUtil.h header to be
consistent with what is really done; This will not break backward
compatibility because WINGs.h starts by including the WUtil.h header, so on
source side it is equivalent.
Versions for WUtil and WINGs are, of course, not changed then as the whole
purpose of this patch is to keep both source and binary compatibility.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
---
WINGs/WINGs/WINGs.h | 17 +----------------
WINGs/WINGs/WUtil.h | 23 +++++++++++++++++++++++
2 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/WINGs/WINGs/WINGs.h b/WINGs/WINGs/WINGs.h
index 4798174..7760431 100644
--- a/WINGs/WINGs/WINGs.h
+++ b/WINGs/WINGs/WINGs.h
@@ -26,7 +26,7 @@
#include <WINGs/WUtil.h>
#include <X11/Xlib.h>
-#define WINGS_H_VERSION 20141205
+#define WINGS_H_VERSION 20141220
#ifdef __cplusplus
@@ -639,21 +639,6 @@ WMRect wmkrect(int x, int y, unsigned int width, unsigned
int height);
#define wmkpoint(x, y) (WMPoint){(x), (y)}
#endif
-/* ---[ WINGs/wapplication.c ]-------------------------------------------- */
-
-
-void WMInitializeApplication(const char *applicationName, int *argc, char
**argv);
-
-/* You're supposed to call this funtion before exiting so WINGs can terminate
properly */
-void WMReleaseApplication(void);
-
-void WMSetResourcePath(const char *path);
-
-/* don't free the returned string */
-char* WMGetApplicationName(void);
-
-/* Try to locate resource file. ext may be NULL */
-char* WMPathForResourceOfType(const char *resource, const char *ext);
/* ---[ WINGs/widgets.c ]------------------------------------------------- */
diff --git a/WINGs/WINGs/WUtil.h b/WINGs/WINGs/WUtil.h
index 04e1197..e312c92 100644
--- a/WINGs/WINGs/WUtil.h
+++ b/WINGs/WINGs/WUtil.h
@@ -298,6 +298,29 @@ void wutil_shutdown(void);
void wusleep(unsigned int usec);
+
+/* ---[ WINGs/wapplication.c ]-------------------------------------------- */
+
+/*
+ * Conceptually, these functions should be part of WINGs, not WUtil, but for
+ * historical reason they have been compiled into WUtil, so to avoid beaking
+ * binary compatibility we keep them here
+ */
+
+void WMInitializeApplication(const char *applicationName, int *argc, char
**argv);
+
+/* You're supposed to call this funtion before exiting so WINGs can terminate
properly */
+void WMReleaseApplication(void);
+
+void WMSetResourcePath(const char *path);
+
+/* don't free the returned string */
+char* WMGetApplicationName(void);
+
+/* Try to locate resource file. ext may be NULL */
+char* WMPathForResourceOfType(const char *resource, const char *ext);
+
+
/* ---[ WINGs/handlers.c ]------------------------------------------------ */
/* Event handlers: timer, idle, input */
--
2.1.4
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
