From johans@stack.nl  Mon Jan 24 22:27:15 2005
Return-Path: <johans@stack.nl>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EB2FD16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Jan 2005 22:27:15 +0000 (GMT)
Received: from skynet.stack.nl (skynet.stack.nl [131.155.140.225])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A43F143D1F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Jan 2005 22:27:15 +0000 (GMT)
	(envelope-from johans@stack.nl)
Received: by skynet.stack.nl (Postfix, from userid 65534)
	id 301614129; Mon, 24 Jan 2005 23:27:59 +0100 (CET)
Received: from mud.stack.nl (outerspace.stack.nl [131.155.141.98])
	by skynet.stack.nl (Postfix) with ESMTP id D53F93F7F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 Jan 2005 23:27:58 +0100 (CET)
Received: by mud.stack.nl (Postfix, from userid 801)
	id 01F9C504; Mon, 24 Jan 2005 23:27:14 +0100 (CET)
Message-Id: <20050124222714.01F9C504@mud.stack.nl>
Date: Mon, 24 Jan 2005 23:27:14 +0100 (CET)
From: Johan van Selst <johans@stack.nl>
Reply-To: Johan van Selst <johans@stack.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: games/KnightCap: fix compilation on FreeBSD >= 5.x
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         76635
>Category:       ports
>Synopsis:       games/KnightCap: fix compilation on FreeBSD >= 5.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 24 22:30:28 GMT 2005
>Closed-Date:    Wed Jan 26 15:25:34 GMT 2005
>Last-Modified:  Wed Jan 26 15:25:34 GMT 2005
>Originator:     Johan van Selst
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 5.3-STABLE FreeBSD 5.3-STABLE #3: Thu Jan 13 13:11:19 CET 2005 root@mud.stack.nl:/usr/local/spare1/TEMP/obj/usr/src/sys/mud i386


	
>Description:
	
	Patch is quite trivial: remove two conflicting functions,
	which are never used anyway.

	I'm not sure what this program is supposed to do exactly though;
	so just sending it off in the spirit of "it compiles: ship it!"

>How-To-Repeat:
	
>Fix:

	

Add this patch as files/patch-knightcap.h:


--- knightcap.h	Mon Jan 24 22:20:22 2005
+++ knightcap.h	Mon Jan 24 22:17:19 2005
@@ -632,16 +632,6 @@
 	return i1 > i2? i1 : i2;
 }
 
-static inline float fmin(float i1, float i2)
-{
-	return i1 > i2? i2 : i1;
-}
-
-static inline float fmax(float i1, float i2)
-{
-	return i1 > i2? i1 : i2;
-}
-
 static inline etype emin(etype i1, etype i2)
 {
 	return i1 > i2? i2 : i1;
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Wed Jan 26 15:25:25 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76635 
>Unformatted:
