summaryrefslogtreecommitdiff
path: root/x11-wm/fvwm95-i18n/files/patch-modules-FvwmIconMan-FvwmIconMan.c
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2003-12-07 21:10:01 +0000
committerPav Lucistnik <pav@FreeBSD.org>2003-12-07 21:10:01 +0000
commit35995a2b9ef7f1fbbb8ee64b84a343e81f3eedfe (patch)
tree2ed852fa38ec62fd877fd5433f0fbff03b810431 /x11-wm/fvwm95-i18n/files/patch-modules-FvwmIconMan-FvwmIconMan.c
parentfix build in case devel/fam is installed (diff)
- Unbreak on 5.x (add patch from x11-wm/fvwm95)
PR: ports/60017 Submitted by: Volker Stolz <vs@foldr.org>
Diffstat (limited to '')
-rw-r--r--x11-wm/fvwm95-i18n/files/patch-modules-FvwmIconMan-FvwmIconMan.c34
1 files changed, 34 insertions, 0 deletions
diff --git a/x11-wm/fvwm95-i18n/files/patch-modules-FvwmIconMan-FvwmIconMan.c b/x11-wm/fvwm95-i18n/files/patch-modules-FvwmIconMan-FvwmIconMan.c
new file mode 100644
index 000000000000..9bc0578383d1
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-modules-FvwmIconMan-FvwmIconMan.c
@@ -0,0 +1,34 @@
+--- 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)
+ {