mips platforms already have 'mips' defined, so rename a variable named 'mips'

to fix the build of celestia on mips64*.

ok aja@ (MAINTAINER)
This commit is contained in:
jasper 2012-12-22 18:35:24 +00:00
parent 04e50bce7a
commit 19d00f8a45
3 changed files with 34 additions and 2 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.28 2012/09/21 13:21:44 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.29 2012/12/22 18:35:24 jasper Exp $
COMMENT= free space simulator and planetarium
DISTNAME= celestia-1.6.1
REVISION= 4
REVISION= 5
CATEGORIES= astro x11

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_celengine_image_cpp,v 1.3 2012/12/22 18:35:24 jasper Exp $
mips platforms already have 'mips' defined, resulting in:
error: expected ',' or '...' before numeric constant
--- src/celengine/image.cpp.orig Sat Dec 22 18:02:55 2012
+++ src/celengine/image.cpp Sat Dec 22 18:03:05 2012
@@ -143,10 +143,10 @@ static int calcMipLevelSize(int fmt, int w, int h, int
}
-Image::Image(int fmt, int w, int h, int mips) :
+Image::Image(int fmt, int w, int h, int mipsen) :
width(w),
height(h),
- mipLevels(mips),
+ mipLevels(mipsen),
format(fmt),
pixels(NULL)
{

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_celengine_image_h,v 1.1 2012/12/22 18:35:24 jasper Exp $
--- src/celengine/image.h.orig Sat Dec 22 18:02:35 2012
+++ src/celengine/image.h Sat Dec 22 18:02:42 2012
@@ -22,7 +22,7 @@
class Image
{
public:
- Image(int fmt, int w, int h, int mips = 1);
+ Image(int fmt, int w, int h, int mipsen = 1);
~Image();
int getWidth() const;