diff options
| author | martin <martin> | 2005-09-08 13:39:21 +0000 |
|---|---|---|
| committer | martin <martin> | 2005-09-08 13:39:21 +0000 |
| commit | 54ad7de260115226cec44af5d60df5dbb434c246 (patch) | |
| tree | 0117c4b4b973da2c3e7561461770a6fa9c3ff76d /games/xscavenger/patches | |
| parent | accda105eae0449e3c1647c73362651b9337217b (diff) | |
| download | pkgsrc-54ad7de260115226cec44af5d60df5dbb434c246.tar.gz | |
Changes from Michael Lorenz - make it work on machines where long != uint32 -
it works on sparc64 now.
Diffstat (limited to 'games/xscavenger/patches')
| -rw-r--r-- | games/xscavenger/patches/patch-ac | 47 | ||||
| -rw-r--r-- | games/xscavenger/patches/patch-ad | 13 |
2 files changed, 60 insertions, 0 deletions
diff --git a/games/xscavenger/patches/patch-ac b/games/xscavenger/patches/patch-ac new file mode 100644 index 00000000000..d0c84a3fbbe --- /dev/null +++ b/games/xscavenger/patches/patch-ac @@ -0,0 +1,47 @@ +$NetBSD: patch-ac,v 1.1 2005/09/08 13:39:21 martin Exp $ + +--- scav.c.orig 2002-02-10 01:35:36.000000000 +0100 ++++ scav.c 2005-09-08 14:53:03.000000000 +0200 +@@ -240,17 +240,18 @@ void *configtab[]= + + + +-long readlong() ++uint32_t readlong() + { +-long val1=0; ++ uint32_t val1=0; + +- val1=myci()<<24L; +- val1|=myci()<<16L; +- val1|=myci()<<8; +- val1|=myci(); ++ val1=(myci() & 0xff)<<24L; ++ val1|=(myci() & 0xff)<<16L; ++ val1|=(myci() & 0xff)<<8; ++ val1|=(myci() & 0xff); + + return val1; + } ++ + int rbs() + { + int ch; +@@ -274,7 +275,7 @@ int myci() + + uchar *doiff(uchar *name) + { +-long type,size; ++uint32_t type,size; + uchar comp; + int i,j; + /* +@@ -309,7 +310,7 @@ uchar temparea[256]; + bmw=bmh=byteswide=0; + while( (type=readlong()) ) + { +- if(type==0xffffffffL) break; ++ if(type==0xffffffff) break; + size=readlong(); + if(size&1) size++; + if(type==BMHD) diff --git a/games/xscavenger/patches/patch-ad b/games/xscavenger/patches/patch-ad new file mode 100644 index 00000000000..a2cfe53ea4b --- /dev/null +++ b/games/xscavenger/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2005/09/08 13:39:21 martin Exp $ + +--- scav.h.orig 2001-01-10 17:10:22.000000000 +0100 ++++ scav.h 2005-09-08 14:52:08.000000000 +0200 +@@ -383,7 +383,7 @@ extern uchar ibuff[IBUFFLEN]; + extern uchar *getgfx(); + + +-extern long readlong(); ++extern uint32_t readlong(); /* because that's what it reads */ + extern int rbs(); + extern int myci(); + |