From owner-freebsd-ports Wed Oct 31 17:59:39 2001 Delivered-To: freebsd-ports@freebsd.org Received: from digger1.defence.gov.au (digger1.defence.gov.au [203.5.217.4]) by hub.freebsd.org (Postfix) with ESMTP id 44DF937B403; Wed, 31 Oct 2001 17:59:34 -0800 (PST) Received: from dsto-ms2.dsto.defence.gov.au (dsto-ms2.dsto.defence.gov.au [131.185.2.150]) by digger1.defence.gov.au (8.10.1/8.10.1) with ESMTP id fA11wpF00308; Thu, 1 Nov 2001 12:28:51 +1030 (CST) Received: from muttley.dsto.defence.gov.au (unverified) by dsto-ms2.dsto.defence.gov.au (Content Technologies SMTPRS 4.1.5) with ESMTP id ; Thu, 1 Nov 2001 12:29:23 +1030 Received: from salex001.dsto.defence.gov.au (salex001.dsto.defence.gov.au [131.185.2.9]) by muttley.dsto.defence.gov.au (8.9.3/8.9.3/8.9.3.LMD.990513) with ESMTP id MAA15590; Thu, 1 Nov 2001 12:20:31 +1030 (CST) Received: from fang.dsto.defence.gov.au ([131.185.2.5]) by salex001.dsto.defence.gov.au with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2653.13) id VWKSSQNN; Thu, 1 Nov 2001 12:20:27 +1030 Received: from dsto.defence.gov.au (fuzz.dsto.defence.gov.au [131.185.75.229]) by fang.dsto.defence.gov.au (8.9.3/8.9.3/8.9.3.LMD.990513) with ESMTP id MAA07039; Thu, 1 Nov 2001 12:20:29 +1030 (CST) Message-ID: <3BE0AA66.2168105A@dsto.defence.gov.au> Date: Thu, 01 Nov 2001 12:20:30 +1030 From: "Thyer, Matthew" X-Mailer: Mozilla 4.76 [en] (X11; U; FreeBSD 5.0-CURRENT i386) X-Accept-Language: en MIME-Version: 1.0 To: Peter Pentchev Cc: murray@freebsd.org, ports@freebsd.org Subject: Re: ports/devel/nasm fails to build on recent -CURRENT due to has been replaced by References: <3BDF453A.2692101B@dsto.defence.gov.au> <20011031182141.B73971@straylight.oblivion.bg> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org Peter Pentchev wrote: > > On Wed, Oct 31, 2001 at 10:56:34AM +1030, Thyer, Matthew wrote: > > cc -c -O -pipe -Wall -ansi -pedantic -I. -I.. symtab.c > > In file included from symtab.c:12: > > /usr/include/malloc.h:2: #error " has been replaced by " > > *** Error code 1 > > Please try the attached patch. Also attached is a message I sent to > H. Peter Anvin, who is listed as the last person who touched the nasm > source :) > > G'luck, > Peter Thanks Peter, your patch to nasm worked fine allowing me to build xmame successfully. Xmame also appears to run as far as I have tested it (which is not much). --- rdoff/symtab.c.old Wed Oct 31 16:52:11 2001 +++ rdoff/symtab.c Wed Oct 31 16:52:17 2001 @@ -9,7 +9,6 @@ */ #include #include -#include #include "symtab.h" #include "hash.h" -- Matthew Thyer Phone: +61 8 8259 7249 Science Corporate Information Systems Fax: +61 8 8259 5537 Defence Science and Technology Organisation, Edinburgh PO Box 1500 EDINBURGH South Australia 5111 IMPORTANT: This email remains the property of the Australian Defence Organisation and is subject to the jurisdiction of section 70 of the CRIMES ACT 1914. If you have received this email in error, you are requested to contact the sender and delete the email. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message