ports/60017: [patch] x11-wm/fvwm95-i18n: Unbreak on -CURRENT

[Volker Stolz]

>Number:         60017
>Category:       ports
>Synopsis:       [patch] x11-wm/fvwm95-i18n: Unbreak on -CURRENT
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 07 08:30:22 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Volker Stolz
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD monster.theater.foldr.org 5.1-CURRENT FreeBSD 5.1-CURRENT #3: Tue Nov 4 20:59:47 CET 2003 root at monster.theater.foldr.org:/opt/obj/usr/src/sys/MONSTER i386


>Description:
Unbreak on -CURRENT: Grab patch from fvwm95
>How-To-Repeat:
http://bento.freebsd.org/errorlogs/i386-5-latest/fvwm95-i18n-2.0.43a.log
>Fix:
Add new patch-file:
--- patch-modules-FvwmIconMan-FvwmIconMan.c begins here ---
$FreeBSD: ports/x11-wm/fvwm95/files/patch-modules-FvwmIconMan-FvwmIconMan.c,v 1.1 2003/11/01 07:47:22 glewis Exp $

--- 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)
 {
--- patch-modules-FvwmIconMan-FvwmIconMan.c ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: