Date: Thu, 30 Oct 2003 13:14:46 +0100 (CET) From: Volker Stolz <stolz@i2.informatik.rwth-aachen.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58719: [patch] Unbreak x11-wm/fvwm95 on GCC3 Message-ID: <200310301214.h9UCEkjv011755@menelaos.informatik.rwth-aachen.de> Resent-Message-ID: <200310301220.h9UCKCnu024827@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58719
>Category: ports
>Synopsis: [patch] Unbreak x11-wm/fvwm95 on GCC3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 30 04:20:11 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Volker Stolz
>Release: FreeBSD 4.9-RC i386
>Organization:
Lehrstuhl für Informatik II
>Environment:
System: FreeBSD menelaos.informatik.rwth-aachen.de 4.9-RC FreeBSD 4.9-RC #10: Tue Oct 7 12:32:25 CEST 2003 root@menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386
>Description:
Fix gcc3-issues regarding ## in cpp. gcc33 now does the Right Thing
anyway.
Noticed by: bento
Tested on: -STABLE, gcc & gcc33
>How-To-Repeat:
>Fix:
Add new patch file patch-modules-FvwmIconMan-FvwmIconMan.c:
--- fvwm95 begins here ---
--- 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)
{
--- fvwm95 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310301214.h9UCEkjv011755>