cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fix C++ syntax errors revealed by GCC3

Browse Source 
* use ${CXX} rather than ${CC} to link C++ code
This commit is contained in:
naddy 2004-01-14 17:32:01 +00:00
parent 43ba2b8973
commit 05d8e6661d
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
games/abuse/patches/patch-abuse_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-abuse_Makefile_in,v 1.1 2004/01/14 17:18:12 naddy Exp $
$OpenBSD: patch-abuse_Makefile_in,v 1.2 2004/01/14 17:32:01 naddy Exp $
--- abuse/Makefile.in.orig 1997-07-09 09:55:21.000000000 +0200
+++ abuse/Makefile.in 2004-01-14 18:14:33.000000000 +0100
+++ abuse/Makefile.in 2004-01-14 18:16:09.000000000 +0100
@@ -37,10 +37,10 @@ AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
@ -25,6 +25,15 @@ $OpenBSD: patch-abuse_Makefile_in,v 1.1 2004/01/14 17:18:12 naddy Exp $
COMPILE = $(CXX) $(DEFS) $(MYDEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(ADDCXXFLAGS) -o $@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -170,7 +170,7 @@ abuse_x11R6_LDFLAGS =
SCRIPTS = $(bin_SCRIPTS)
CFLAGS = @CFLAGS@
-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+LINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
DATA = $(pkgdata_DATA)
DIST_COMMON = Makefile.am Makefile.in abuse.in acinclude.m4 aclocal.m4 \
@@ -239,11 +239,11 @@ maintainer-clean-pkglibPROGRAMS:
install-pkglibPROGRAMS: $(pkglib_PROGRAMS)

12
games/abuse/patches/patch-abuse_src_ant_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-abuse_src_ant_c,v 1.1 2004/01/14 17:32:01 naddy Exp $
--- abuse/src/ant.c.orig 2004-01-14 18:15:13.000000000 +0100
+++ abuse/src/ant.c 2004-01-14 18:15:28.000000000 +0100
@@ -234,7 +234,7 @@ void *ant_ai()
{
o->set_state(stopped);
o->set_aistate(ANT_RUNNING);
- return ant_ai;
+ return (void *)ant_ai;
}
}
} break;

16
games/abuse/patches/patch-abuse_src_gamma_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-abuse_src_gamma_c,v 1.1 2004/01/14 17:32:01 naddy Exp $
--- abuse/src/gamma.c.orig 2004-01-14 18:15:36.000000000 +0100
+++ abuse/src/gamma.c 2004-01-14 18:15:53.000000000 +0100
@@ -137,9 +137,9 @@ void gamma_correct(palette *&pal, int fo
for (int i=0;i<256;i++)
{
double r,g,b;
- uchar or,og,ob;
- old_pal->get(i,or,og,ob);
- pal->set(i,(int)(pow(or/255.0,gamma)*255),
+ uchar orr,og,ob;
+ old_pal->get(i,orr,og,ob);
+ pal->set(i,(int)(pow(orr/255.0,gamma)*255),
(int)(pow(og/255.0,gamma)*255),
(int)(pow(ob/255.0,gamma)*255));
}