From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 30 04:20:14 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 781D116A4CF for ; Thu, 30 Oct 2003 04:20:14 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 483E843F93 for ; Thu, 30 Oct 2003 04:20:13 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UCKCFY024828 for ; Thu, 30 Oct 2003 04:20:12 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9UCKCnu024827; Thu, 30 Oct 2003 04:20:12 -0800 (PST) (envelope-from gnats) Resent-Date: Thu, 30 Oct 2003 04:20:12 -0800 (PST) Resent-Message-Id: <200310301220.h9UCKCnu024827@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Volker Stolz Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F86316A4CE for ; Thu, 30 Oct 2003 04:14:49 -0800 (PST) Received: from atlas.informatik.rwth-aachen.de (atlas.Informatik.RWTH-Aachen.DE [137.226.194.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF78743FAF for ; Thu, 30 Oct 2003 04:14:47 -0800 (PST) (envelope-from stolz@i2.informatik.rwth-aachen.de) Received: from menelaos.informatik.rwth-aachen.de (menelaos.Informatik.RWTH-Aachen.DE [137.226.194.73]) 8.11.1-0.5-michaelw-20030918) with ESMTP id h9UCEie15319 for ; Thu, 30 Oct 2003 13:14:44 +0100 Received: (from stolz@localhost)h9UCEkjv011755; Thu, 30 Oct 2003 13:14:46 +0100 (CET) (envelope-from stolz) Message-Id: <200310301214.h9UCEkjv011755@menelaos.informatik.rwth-aachen.de> Date: Thu, 30 Oct 2003 13:14:46 +0100 (CET) From: Volker Stolz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/58719: [patch] Unbreak x11-wm/fvwm95 on GCC3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Volker Stolz List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Oct 2003 12:20:14 -0000 >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: