summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2003-11-01 07:47:22 +0000
committerglewis <glewis@FreeBSD.org>2003-11-01 07:47:22 +0000
commit6446947ecf7e2ac3184949833d44e2fd8c9a92fa (patch)
treef9881c9590edd047d8cf42a965e5bcee34ff00b4
parentd4c6595a80e7c23b685f5bf30524bdb3dbf7cadc (diff)
downloadFreeBSD-ports-6446947ecf7e2ac3184949833d44e2fd8c9a92fa.zip
FreeBSD-ports-6446947ecf7e2ac3184949833d44e2fd8c9a92fa.tar.gz
. Unbreak compilation on 5.x (gcc 3.3).
PR: 58719 Submitted by: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
-rw-r--r--x11-wm/fvwm95/files/patch-modules-FvwmIconMan-FvwmIconMan.c36
1 files changed, 36 insertions, 0 deletions
diff --git a/x11-wm/fvwm95/files/patch-modules-FvwmIconMan-FvwmIconMan.c b/x11-wm/fvwm95/files/patch-modules-FvwmIconMan-FvwmIconMan.c
new file mode 100644
index 0000000..ff022d3
--- /dev/null
+++ b/x11-wm/fvwm95/files/patch-modules-FvwmIconMan-FvwmIconMan.c
@@ -0,0 +1,36 @@
+$FreeBSD$
+
+--- modules/FvwmIconMan/FvwmIconMan.c.orig Thu Oct 30 12:53:01 2003
++++ modules/FvwmIconMan/FvwmIconMan.c Thu Oct 30 13:10:36 2003
+@@ -315,6 +315,23 @@
+ return copy_string (s1, s2);
+ }
+
++#if __GNUC__ > 2
++#define SET_MANAGER(manager,field,value) \
++ do { \
++ int id = manager; \
++ if (id == -1) { \
++ for (id = 0; id < globals.num_managers; id++) { \
++ globals.managers[id].field = value; \
++ } \
++ } \
++ else if (id < globals.num_managers) { \
++ globals.managers[id].field = value; \
++ } \
++ else { \
++ ConsoleMessage ("Internal error in SET_MANAGER: %d\n", id); \
++ } \
++ } while (0)
++#else
+ #define SET_MANAGER(manager,field,value) \
+ do { \
+ int id = manager; \
+@@ -330,6 +347,7 @@
+ ConsoleMessage ("Internal error in SET_MANAGER: %d\n", id); \
+ } \
+ } while (0)
++#endif /* GCC 2 */
+
+ static void read_in_resources (char *file)
+ {
OpenPOWER on IntegriCloud