From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Dec 7 08:30:26 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 9DC4016A4CE for ; Sun, 7 Dec 2003 08:30:26 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 911A043F75 for ; Sun, 7 Dec 2003 08:30:23 -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 hB7GUNFY003874 for ; Sun, 7 Dec 2003 08:30:23 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hB7GUNPk003873; Sun, 7 Dec 2003 08:30:23 -0800 (PST) (envelope-from gnats) Resent-Date: Sun, 7 Dec 2003 08:30:23 -0800 (PST) Resent-Message-Id: <200312071630.hB7GUNPk003873@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 EE03A16A4CE for ; Sun, 7 Dec 2003 08:22:22 -0800 (PST) Received: from lambda.foldr.org (lambda.foldr.org [69.55.238.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5109C43F75 for ; Sun, 7 Dec 2003 08:22:21 -0800 (PST) (envelope-from vs@foldr.org) Received: from theater.foldr.org (root@pD9008CEA.dip.t-dialin.net [217.0.140.234]) by lambda.foldr.org (8.12.10/8.12.10) with ESMTP id hB7GMG4j084010 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 7 Dec 2003 17:22:18 +0100 (CET) (envelope-from vs@foldr.org) Received: from monster.theater.foldr.org (monster.ipv6.foldr.org [IPv6:3ffe:b80:2de:3:2e0:29ff:fe98:abca]) by theater.foldr.org (8.12.9/8.12.9) with ESMTP id hB7GMDfZ078401 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Sun, 7 Dec 2003 17:22:15 +0100 (CET) (envelope-from vs@monster.theater.foldr.org) Received: (from vs@localhost)hB7GMAIl024862; Sun, 7 Dec 2003 17:22:10 +0100 (CET) (envelope-from vs) Received: (from vs@localhost)hB7GFFCa024741; Sun, 7 Dec 2003 17:15:15 +0100 (CET) (envelope-from vs) Message-Id: <200312071615.hB7GFFCa024741@monster.theater.foldr.org> Date: Sun, 7 Dec 2003 17:15:15 +0100 (CET) From: Volker Stolz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/60017: [patch] x11-wm/fvwm95-i18n: Unbreak on -CURRENT 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: Sun, 07 Dec 2003 16:30:26 -0000 >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@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: