Changeset 4
- Timestamp:
- Nov 6, 2005, 11:39:38 AM (18 years ago)
- Location:
- abuse/trunk
- Files:
-
- 46 edited
-
config.guess (modified) (43 diffs)
-
config.sub (modified) (42 diffs)
-
libtool (modified) (2 diffs)
-
src/chars.cpp (modified) (1 diff)
-
src/collide.cpp (modified) (1 diff)
-
src/cop.cpp (modified) (3 diffs)
-
src/demo.cpp (modified) (2 diffs)
-
src/dev.cpp (modified) (1 diff)
-
src/game.cpp (modified) (3 diffs)
-
src/gamma.cpp (modified) (1 diff)
-
src/imlib/dprint.cpp (modified) (1 diff)
-
src/imlib/filesel.cpp (modified) (2 diffs)
-
src/imlib/fonts.cpp (modified) (1 diff)
-
src/imlib/gifread.cpp (modified) (1 diff)
-
src/imlib/include.cpp (modified) (1 diff)
-
src/imlib/input.cpp (modified) (4 diffs)
-
src/imlib/jmalloc.cpp (modified) (8 diffs)
-
src/imlib/jwindow.cpp (modified) (3 diffs)
-
src/imlib/keys.cpp (modified) (1 diff)
-
src/imlib/lbmread.cpp (modified) (2 diffs)
-
src/imlib/palette.cpp (modified) (2 diffs)
-
src/imlib/pmenu.cpp (modified) (1 diff)
-
src/imlib/scroller.cpp (modified) (4 diffs)
-
src/imlib/specs.cpp (modified) (11 diffs)
-
src/imlib/targa.cpp (modified) (1 diff)
-
src/imlib/xwdread.cpp (modified) (1 diff)
-
src/innet.cpp (modified) (2 diffs)
-
src/lcache.cpp (modified) (1 diff)
-
src/light.cpp (modified) (2 diffs)
-
src/lisp.cpp (modified) (18 diffs)
-
src/lisp_gc.cpp (modified) (1 diff)
-
src/loader2.cpp (modified) (4 diffs)
-
src/loadgame.cpp (modified) (1 diff)
-
src/net/gserver.cpp (modified) (1 diff)
-
src/net/include/fileman.hpp (modified) (1 diff)
-
src/net/include/gserver.hpp (modified) (1 diff)
-
src/net/include/tcpip.hpp (modified) (2 diffs)
-
src/net/tcpip.cpp (modified) (3 diffs)
-
src/netcfg.cpp (modified) (2 diffs)
-
src/nfclient.cpp (modified) (1 diff)
-
src/objects.cpp (modified) (8 diffs)
-
src/sdlport/event.cpp (modified) (1 diff)
-
src/sdlport/setup.cpp (modified) (4 diffs)
-
src/sdlport/sound.cpp (modified) (2 diffs)
-
src/sdlport/video.cpp (modified) (2 diffs)
-
src/unixnfc.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
abuse/trunk/config.guess
r2 r4 1 1 #! /bin/sh 2 2 # Attempt to guess a canonical system name. 3 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 20014 # Free Software Foundation, Inc.5 6 timestamp='200 1-10-05'3 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 4 # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. 5 6 timestamp='2004-03-12' 7 7 8 8 # This file is free software; you can redistribute it and/or modify it … … 25 25 # the same distribution terms that you use for the rest of that program. 26 26 27 # Originally written by Per Bothner < bothner@cygnus.com>.27 # Originally written by Per Bothner <per@bothner.com>. 28 28 # Please send patches to <config-patches@gnu.org>. Submit a context 29 29 # diff and a properly formatted ChangeLog entry. … … 89 89 fi 90 90 91 92 dummy=dummy-$$ 93 trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 94 95 # CC_FOR_BUILD -- compiler used by this script. 91 trap 'exit 1' 1 2 15 92 93 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a 94 # compiler to aid in system detection is discouraged as it requires 95 # temporary files to be created and, as you can see below, it is a 96 # headache to deal with in a portable fashion. 97 96 98 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still 97 99 # use `HOST_CC' if defined, but it is deprecated. 98 100 99 set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in 100 ,,) echo "int dummy(){}" > $dummy.c ; 101 for c in cc gcc c89 ; do 102 ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; 103 if test $? = 0 ; then 101 # Portable tmp directory creation inspired by the Autoconf team. 102 103 set_cc_for_build=' 104 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; 105 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; 106 : ${TMPDIR=/tmp} ; 107 { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || 108 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || 109 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || 110 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; 111 dummy=$tmp/dummy ; 112 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; 113 case $CC_FOR_BUILD,$HOST_CC,$CC in 114 ,,) echo "int x;" > $dummy.c ; 115 for c in cc gcc c89 c99 ; do 116 if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then 104 117 CC_FOR_BUILD="$c"; break ; 105 118 fi ; 106 119 done ; 107 rm -f $dummy.c $dummy.o $dummy.rel ;108 120 if test x"$CC_FOR_BUILD" = x ; then 109 121 CC_FOR_BUILD=no_compiler_found ; … … 112 124 ,,*) CC_FOR_BUILD=$CC ;; 113 125 ,*,*) CC_FOR_BUILD=$HOST_CC ;; 114 esac '126 esac ;' 115 127 116 128 # This is needed to find uname on a Pyramid OSx when run in the BSD universe. … … 136 148 # compatibility and a consistent mechanism for selecting the 137 149 # object file format. 138 # Determine the machine/vendor (is the vendor relevant).139 case "${UNAME_MACHINE}" in140 amiga) machine=m68k-unknown ;;141 arm32) machine=arm-unknown ;;142 atari*) machine=m68k-atari ;;143 sun3*) machine=m68k-sun ;;144 mac68k) machine=m68k-apple ;;145 macppc) machine=powerpc-apple;;146 hp3[0-9][05]) machine=m68k-hp;;147 ibmrt|romp-ibm) machine=romp-ibm;;148 s parc*) machine=`uname -p`-unknown ;;149 *) machine=${UNAME_MACHINE }-unknown ;;150 # 151 # Note: NetBSD doesn't particularly care about the vendor 152 # portion of the name. We always set it to "unknown". 153 sysctl="sysctl -n hw.machine_arch" 154 UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ 155 /usr/sbin/$sysctl 2>/dev/null || echo unknown)` 156 case "${UNAME_MACHINE_ARCH}" in 157 armeb) machine=armeb-unknown ;; 158 arm*) machine=arm-unknown ;; 159 sh3el) machine=shl-unknown ;; 160 sh3eb) machine=sh-unknown ;; 161 *) machine=${UNAME_MACHINE_ARCH}-unknown ;; 150 162 esac 151 163 # The Operating System including object format, if it has switched 152 164 # to ELF recently, or will in the future. 153 case "${UNAME_MACHINE }" in154 i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)165 case "${UNAME_MACHINE_ARCH}" in 166 arm*|i386|m68k|ns32k|sh3*|sparc|vax) 155 167 eval $set_cc_for_build 156 168 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ … … 169 181 esac 170 182 # The OS release 171 release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` 183 # Debian GNU/NetBSD machines have a different userland, and 184 # thus, need a distinct triplet. However, they do not need 185 # kernel version information, so it can be replaced with a 186 # suitable tag, in the style of linux-gnu. 187 case "${UNAME_VERSION}" in 188 Debian*) 189 release='-gnu' 190 ;; 191 *) 192 release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` 193 ;; 194 esac 172 195 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: 173 196 # contains redundant information, the shorter form: … … 175 198 echo "${machine}-${os}${release}" 176 199 exit 0 ;; 200 amd64:OpenBSD:*:*) 201 echo x86_64-unknown-openbsd${UNAME_RELEASE} 202 exit 0 ;; 177 203 amiga:OpenBSD:*:*) 178 204 echo m68k-unknown-openbsd${UNAME_RELEASE} … … 181 207 echo mipsel-unknown-openbsd${UNAME_RELEASE} 182 208 exit 0 ;; 209 cats:OpenBSD:*:*) 210 echo arm-unknown-openbsd${UNAME_RELEASE} 211 exit 0 ;; 183 212 hp300:OpenBSD:*:*) 184 213 echo m68k-unknown-openbsd${UNAME_RELEASE} … … 199 228 echo powerpc-unknown-openbsd${UNAME_RELEASE} 200 229 exit 0 ;; 230 pegasos:OpenBSD:*:*) 231 echo powerpc-unknown-openbsd${UNAME_RELEASE} 232 exit 0 ;; 201 233 pmax:OpenBSD:*:*) 202 234 echo mipsel-unknown-openbsd${UNAME_RELEASE} … … 214 246 echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} 215 247 exit 0 ;; 248 *:ekkoBSD:*:*) 249 echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} 250 exit 0 ;; 251 macppc:MirBSD:*:*) 252 echo powerppc-unknown-mirbsd${UNAME_RELEASE} 253 exit 0 ;; 254 *:MirBSD:*:*) 255 echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} 256 exit 0 ;; 216 257 alpha:OSF1:*:*) 217 if test $UNAME_RELEASE = "V4.0"; then 258 case $UNAME_RELEASE in 259 *4.0) 218 260 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` 219 fi 261 ;; 262 *5.*) 263 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` 264 ;; 265 esac 266 # According to Compaq, /usr/sbin/psrinfo has been available on 267 # OSF/1 and Tru64 systems produced since 1995. I hope that 268 # covers most systems running today. This code pipes the CPU 269 # types through head -n 1, so we only detect the type of CPU 0. 270 ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` 271 case "$ALPHA_CPU_TYPE" in 272 "EV4 (21064)") 273 UNAME_MACHINE="alpha" ;; 274 "EV4.5 (21064)") 275 UNAME_MACHINE="alpha" ;; 276 "LCA4 (21066/21068)") 277 UNAME_MACHINE="alpha" ;; 278 "EV5 (21164)") 279 UNAME_MACHINE="alphaev5" ;; 280 "EV5.6 (21164A)") 281 UNAME_MACHINE="alphaev56" ;; 282 "EV5.6 (21164PC)") 283 UNAME_MACHINE="alphapca56" ;; 284 "EV5.7 (21164PC)") 285 UNAME_MACHINE="alphapca57" ;; 286 "EV6 (21264)") 287 UNAME_MACHINE="alphaev6" ;; 288 "EV6.7 (21264A)") 289 UNAME_MACHINE="alphaev67" ;; 290 "EV6.8CB (21264C)") 291 UNAME_MACHINE="alphaev68" ;; 292 "EV6.8AL (21264B)") 293 UNAME_MACHINE="alphaev68" ;; 294 "EV6.8CX (21264D)") 295 UNAME_MACHINE="alphaev68" ;; 296 "EV6.9A (21264/EV69A)") 297 UNAME_MACHINE="alphaev69" ;; 298 "EV7 (21364)") 299 UNAME_MACHINE="alphaev7" ;; 300 "EV7.9 (21364A)") 301 UNAME_MACHINE="alphaev79" ;; 302 esac 303 # A Pn.n version is a patched version. 220 304 # A Vn.n version is a released version. 221 305 # A Tn.n version is a released field test version. 222 306 # A Xn.n version is an unreleased experimental baselevel. 223 307 # 1.2 uses "1.2" for uname -r. 224 cat <<EOF >$dummy.s 225 .data 226 \$Lformat: 227 .byte 37,100,45,37,120,10,0 # "%d-%x\n" 228 229 .text 230 .globl main 231 .align 4 232 .ent main 233 main: 234 .frame \$30,16,\$26,0 235 ldgp \$29,0(\$27) 236 .prologue 1 237 .long 0x47e03d80 # implver \$0 238 lda \$2,-1 239 .long 0x47e20c21 # amask \$2,\$1 240 lda \$16,\$Lformat 241 mov \$0,\$17 242 not \$1,\$18 243 jsr \$26,printf 244 ldgp \$29,0(\$26) 245 mov 0,\$16 246 jsr \$26,exit 247 .end main 248 EOF 249 eval $set_cc_for_build 250 $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null 251 if test "$?" = 0 ; then 252 case `./$dummy` in 253 0-0) 254 UNAME_MACHINE="alpha" 255 ;; 256 1-0) 257 UNAME_MACHINE="alphaev5" 258 ;; 259 1-1) 260 UNAME_MACHINE="alphaev56" 261 ;; 262 1-101) 263 UNAME_MACHINE="alphapca56" 264 ;; 265 2-303) 266 UNAME_MACHINE="alphaev6" 267 ;; 268 2-307) 269 UNAME_MACHINE="alphaev67" 270 ;; 271 2-1307) 272 UNAME_MACHINE="alphaev68" 273 ;; 274 esac 275 fi 276 rm -f $dummy.s $dummy 277 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 308 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 309 exit 0 ;; 310 Alpha*:OpenVMS:*:*) 311 echo alpha-hp-vms 278 312 exit 0 ;; 279 313 Alpha\ *:Windows_NT*:*) … … 292 326 echo ${UNAME_MACHINE}-unknown-amigaos 293 327 exit 0 ;; 328 *:[Mm]orph[Oo][Ss]:*:*) 329 echo ${UNAME_MACHINE}-unknown-morphos 330 exit 0 ;; 294 331 *:OS/390:*:*) 295 332 echo i370-ibm-openedition 333 exit 0 ;; 334 *:OS400:*:*) 335 echo powerpc-ibm-os400 296 336 exit 0 ;; 297 337 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) … … 312 352 echo pyramid-pyramid-svr4 313 353 exit 0 ;; 354 DRS?6000:unix:4.0:6*) 355 echo sparc-icl-nx6 356 exit 0 ;; 357 DRS?6000:UNIX_SV:4.2*:7*) 358 case `/usr/bin/uname -p` in 359 sparc) echo sparc-icl-nx7 && exit 0 ;; 360 esac ;; 314 361 sun4H:SunOS:5.*:*) 315 362 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` … … 340 387 exit 0 ;; 341 388 sun*:*:4.2BSD:*) 342 UNAME_RELEASE=`( head -1/etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`389 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` 343 390 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 344 391 case "`/bin/arch`" in … … 380 427 echo m68k-unknown-mint${UNAME_RELEASE} 381 428 exit 0 ;; 429 m68k:machten:*:*) 430 echo m68k-apple-machten${UNAME_RELEASE} 431 exit 0 ;; 382 432 powerpc:machten:*:*) 383 433 echo powerpc-apple-machten${UNAME_RELEASE} … … 418 468 } 419 469 EOF 420 $CC_FOR_BUILD $dummy.c -o $dummy \ 421 && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ 422 && rm -f $dummy.c $dummy && exit 0 423 rm -f $dummy.c $dummy 470 $CC_FOR_BUILD -o $dummy $dummy.c \ 471 && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ 472 && exit 0 424 473 echo mips-mips-riscos${UNAME_RELEASE} 425 474 exit 0 ;; 426 475 Motorola:PowerMAX_OS:*:*) 427 476 echo powerpc-motorola-powermax 477 exit 0 ;; 478 Motorola:*:4.3:PL8-*) 479 echo powerpc-harris-powermax 480 exit 0 ;; 481 Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) 482 echo powerpc-harris-powermax 428 483 exit 0 ;; 429 484 Night_Hawk:Power_UNIX:*:*) … … 499 554 } 500 555 EOF 501 $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 502 rm -f $dummy.c $dummy 556 $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 503 557 echo rs6000-ibm-aix3.2.5 504 558 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then … … 509 563 exit 0 ;; 510 564 *:AIX:*:[45]) 511 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1| awk '{ print $1 }'`565 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` 512 566 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then 513 567 IBM_ARCH=rs6000 … … 598 652 } 599 653 EOF 600 (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy` 601 if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi 602 rm -f $dummy.c $dummy 654 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` 655 test -z "$HP_ARCH" && HP_ARCH=hppa 603 656 fi ;; 604 657 esac 658 if [ ${HP_ARCH} = "hppa2.0w" ] 659 then 660 # avoid double evaluation of $set_cc_for_build 661 test -n "$CC_FOR_BUILD" || eval $set_cc_for_build 662 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null 663 then 664 HP_ARCH="hppa2.0w" 665 else 666 HP_ARCH="hppa64" 667 fi 668 fi 605 669 echo ${HP_ARCH}-hp-hpux${HPUX_REV} 606 670 exit 0 ;; … … 636 700 } 637 701 EOF 638 $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 639 rm -f $dummy.c $dummy 702 $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 640 703 echo unknown-hitachi-hiuxwe2 641 704 exit 0 ;; … … 683 746 echo c4-convex-bsd 684 747 exit 0 ;; 685 CRAY*X-MP:*:*:*)686 echo xmp-cray-unicos687 exit 0 ;;688 748 CRAY*Y-MP:*:*:*) 689 749 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' … … 698 758 echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 699 759 exit 0 ;; 700 CRAY*T3D:*:*:*)701 echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'702 exit 0 ;;703 760 CRAY*T3E:*:*:*) 704 761 echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' … … 707 764 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 708 765 exit 0 ;; 709 CRAY-2:*:*:*)710 echo cray2-cray-unicos711 766 *:UNICOS/mp:*:*) 767 echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 768 exit 0 ;; 712 769 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) 713 770 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` … … 716 773 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 717 774 exit 0 ;; 775 5000:UNIX_System_V:4.*:*) 776 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 777 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` 778 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 779 exit 0 ;; 718 780 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) 719 781 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} … … 726 788 exit 0 ;; 727 789 *:FreeBSD:*:*) 728 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 790 # Determine whether the default compiler uses glibc. 791 eval $set_cc_for_build 792 sed 's/^ //' << EOF >$dummy.c 793 #include <features.h> 794 #if __GLIBC__ >= 2 795 LIBC=gnu 796 #else 797 LIBC= 798 #endif 799 EOF 800 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` 801 # GNU/KFreeBSD systems have a "k" prefix to indicate we are using 802 # FreeBSD's kernel, but not the complete OS. 803 case ${LIBC} in gnu) kernel_only='k' ;; esac 804 echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} 729 805 exit 0 ;; 730 806 i*:CYGWIN*:*) … … 736 812 i*:PW*:*) 737 813 echo ${UNAME_MACHINE}-pc-pw32 814 exit 0 ;; 815 x86:Interix*:[34]*) 816 echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' 817 exit 0 ;; 818 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) 819 echo i${UNAME_MACHINE}-pc-mks 738 820 exit 0 ;; 739 821 i*:Windows_NT*:* | Pentium*:Windows_NT*:*) … … 741 823 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we 742 824 # UNAME_MACHINE based on the output of uname instead of i386? 743 echo i 386-pc-interix825 echo i586-pc-interix 744 826 exit 0 ;; 745 827 i*:UWIN*:*) … … 753 835 exit 0 ;; 754 836 *:GNU:*:*) 837 # the GNU system 755 838 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` 839 exit 0 ;; 840 *:GNU/*:*:*) 841 # other systems with GNU libc and userland 842 echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu 756 843 exit 0 ;; 757 844 i*86:Minix:*:*) … … 761 848 echo ${UNAME_MACHINE}-unknown-linux-gnu 762 849 exit 0 ;; 850 cris:Linux:*:*) 851 echo cris-axis-linux-gnu 852 exit 0 ;; 763 853 ia64:Linux:*:*) 764 echo ${UNAME_MACHINE}-unknown-linux 854 echo ${UNAME_MACHINE}-unknown-linux-gnu 855 exit 0 ;; 856 m32r*:Linux:*:*) 857 echo ${UNAME_MACHINE}-unknown-linux-gnu 765 858 exit 0 ;; 766 859 m68*:Linux:*:*) … … 768 861 exit 0 ;; 769 862 mips:Linux:*:*) 770 case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in 771 big) echo mips-unknown-linux-gnu && exit 0 ;; 772 little) echo mipsel-unknown-linux-gnu && exit 0 ;; 773 esac 863 eval $set_cc_for_build 864 sed 's/^ //' << EOF >$dummy.c 865 #undef CPU 866 #undef mips 867 #undef mipsel 868 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 869 CPU=mipsel 870 #else 871 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 872 CPU=mips 873 #else 874 CPU= 875 #endif 876 #endif 877 EOF 878 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` 879 test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 880 ;; 881 mips64:Linux:*:*) 882 eval $set_cc_for_build 883 sed 's/^ //' << EOF >$dummy.c 884 #undef CPU 885 #undef mips64 886 #undef mips64el 887 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 888 CPU=mips64el 889 #else 890 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 891 CPU=mips64 892 #else 893 CPU= 894 #endif 895 #endif 896 EOF 897 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` 898 test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 774 899 ;; 775 900 ppc:Linux:*:*) … … 807 932 echo ${UNAME_MACHINE}-ibm-linux 808 933 exit 0 ;; 934 sh64*:Linux:*:*) 935 echo ${UNAME_MACHINE}-unknown-linux-gnu 936 exit 0 ;; 809 937 sh*:Linux:*:*) 810 938 echo ${UNAME_MACHINE}-unknown-linux-gnu … … 820 948 # first see if it will tell us. cd to the root directory to prevent 821 949 # problems with other programs or directories called `ld' in the path. 822 ld_supported_targets=`cd /; ld --help 2>&1 \ 950 # Set LC_ALL=C to ensure ld outputs messages in English. 951 ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ 823 952 | sed -ne '/supported targets:/!d 824 953 s/[ ][ ]*/ /g … … 832 961 a.out-i386-linux) 833 962 echo "${UNAME_MACHINE}-pc-linux-gnuaout" 834 exit 0 ;; 963 exit 0 ;; 835 964 coff-i386) 836 965 echo "${UNAME_MACHINE}-pc-linux-gnucoff" … … 844 973 # Determine whether the default compiler is a.out or elf 845 974 eval $set_cc_for_build 846 cat >$dummy.c <<EOF 847 #include <features.h> 848 #ifdef __cplusplus 849 #include <stdio.h> /* for printf() prototype */ 850 int main (int argc, char *argv[]) { 851 #else 852 int main (argc, argv) int argc; char *argv[]; { 853 #endif 854 #ifdef __ELF__ 855 # ifdef __GLIBC__ 856 # if __GLIBC__ >= 2 857 printf ("%s-pc-linux-gnu\n", argv[1]); 858 # else 859 printf ("%s-pc-linux-gnulibc1\n", argv[1]); 860 # endif 861 # else 862 printf ("%s-pc-linux-gnulibc1\n", argv[1]); 863 # endif 864 #else 865 printf ("%s-pc-linux-gnuaout\n", argv[1]); 866 #endif 867 return 0; 868 } 975 sed 's/^ //' << EOF >$dummy.c 976 #include <features.h> 977 #ifdef __ELF__ 978 # ifdef __GLIBC__ 979 # if __GLIBC__ >= 2 980 LIBC=gnu 981 # else 982 LIBC=gnulibc1 983 # endif 984 # else 985 LIBC=gnulibc1 986 # endif 987 #else 988 #ifdef __INTEL_COMPILER 989 LIBC=gnu 990 #else 991 LIBC=gnuaout 992 #endif 993 #endif 994 #ifdef __dietlibc__ 995 LIBC=dietlibc 996 #endif 869 997 EOF 870 $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0871 rm -f $dummy.c $dummy998 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` 999 test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 872 1000 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 873 1001 ;; … … 886 1014 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} 887 1015 exit 0 ;; 1016 i*86:OS/2:*:*) 1017 # If we were able to find `uname', then EMX Unix compatibility 1018 # is probably installed. 1019 echo ${UNAME_MACHINE}-pc-os2-emx 1020 exit 0 ;; 1021 i*86:XTS-300:*:STOP) 1022 echo ${UNAME_MACHINE}-unknown-stop 1023 exit 0 ;; 1024 i*86:atheos:*:*) 1025 echo ${UNAME_MACHINE}-unknown-atheos 1026 exit 0 ;; 1027 i*86:syllable:*:*) 1028 echo ${UNAME_MACHINE}-pc-syllable 1029 exit 0 ;; 1030 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) 1031 echo i386-unknown-lynxos${UNAME_RELEASE} 1032 exit 0 ;; 1033 i*86:*DOS:*:*) 1034 echo ${UNAME_MACHINE}-pc-msdosdjgpp 1035 exit 0 ;; 888 1036 i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) 889 1037 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` … … 907 1055 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL 908 1056 elif /bin/uname -X 2>/dev/null >/dev/null ; then 909 UNAME_REL=`(/bin/uname -X| egrep Release|sed -e 's/.*= //')`910 (/bin/uname -X| egrep i80486 >/dev/null) && UNAME_MACHINE=i486911 (/bin/uname -X| egrep '^Machine.*Pentium' >/dev/null) \1057 UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` 1058 (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 1059 (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ 912 1060 && UNAME_MACHINE=i586 913 (/bin/uname -X| egrep '^Machine.*Pent ?II' >/dev/null) \1061 (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ 914 1062 && UNAME_MACHINE=i686 915 (/bin/uname -X| egrep '^Machine.*Pentium Pro' >/dev/null) \1063 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ 916 1064 && UNAME_MACHINE=i686 917 1065 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL … … 919 1067 echo ${UNAME_MACHINE}-pc-sysv32 920 1068 fi 921 exit 0 ;;922 i*86:*DOS:*:*)923 echo ${UNAME_MACHINE}-pc-msdosdjgpp924 1069 exit 0 ;; 925 1070 pc:*:*:*) … … 946 1091 echo m68010-convergent-sysv 947 1092 exit 0 ;; 1093 mc68k:UNIX:SYSTEM5:3.51m) 1094 echo m68k-convergent-sysv 1095 exit 0 ;; 1096 M680?0:D-NIX:5.3:*) 1097 echo m68k-diab-dnix 1098 exit 0 ;; 948 1099 M68*:*:R3V[567]*:*) 949 1100 test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; 950 3[34 ]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)1101 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) 951 1102 OS_REL='' 952 1103 test -r /etc/.relid \ … … 965 1116 echo m68k-atari-sysv4 966 1117 exit 0 ;; 967 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)968 echo i386-unknown-lynxos${UNAME_RELEASE}969 exit 0 ;;970 1118 TSUNAMI:LynxOS:2.*:*) 971 1119 echo sparc-unknown-lynxos${UNAME_RELEASE} … … 1039 1187 echo sx5-nec-superux${UNAME_RELEASE} 1040 1188 exit 0 ;; 1189 SX-6:SUPER-UX:*:*) 1190 echo sx6-nec-superux${UNAME_RELEASE} 1191 exit 0 ;; 1041 1192 Power*:Rhapsody:*:*) 1042 1193 echo powerpc-apple-rhapsody${UNAME_RELEASE} … … 1046 1197 exit 0 ;; 1047 1198 *:Darwin:*:*) 1048 echo `uname -p`-apple-darwin${UNAME_RELEASE} 1199 case `uname -p` in 1200 *86) UNAME_PROCESSOR=i686 ;; 1201 powerpc) UNAME_PROCESSOR=powerpc ;; 1202 esac 1203 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} 1049 1204 exit 0 ;; 1050 1205 *:procnto*:*:* | *:QNX:[0123456789]*:*) 1051 if test "${UNAME_MACHINE}" = "x86pc"; then 1206 UNAME_PROCESSOR=`uname -p` 1207 if test "$UNAME_PROCESSOR" = "x86"; then 1208 UNAME_PROCESSOR=i386 1052 1209 UNAME_MACHINE=pc 1053 1210 fi 1054 echo `uname -p`-${UNAME_MACHINE}-nto-qnx1211 echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} 1055 1212 exit 0 ;; 1056 1213 *:QNX:*:4*) 1057 1214 echo i386-pc-qnx 1058 1215 exit 0 ;; 1059 NSR- [KW]:NONSTOP_KERNEL:*:*)1216 NSR-?:NONSTOP_KERNEL:*:*) 1060 1217 echo nsr-tandem-nsk${UNAME_RELEASE} 1061 1218 exit 0 ;; … … 1080 1237 echo ${UNAME_MACHINE}-unknown-plan9 1081 1238 exit 0 ;; 1082 i*86:OS/2:*:*)1083 # If we were able to find `uname', then EMX Unix compatibility1084 # is probably installed.1085 echo ${UNAME_MACHINE}-pc-os2-emx1086 exit 0 ;;1087 1239 *:TOPS-10:*:*) 1088 1240 echo pdp10-unknown-tops10 … … 1103 1255 echo pdp10-unknown-its 1104 1256 exit 0 ;; 1105 i*86:XTS-300:*:STOP)1106 echo ${UNAME_MACHINE}-unknown-stop 1107 exit 0 ;; 1108 i*86:atheos:*:*)1109 echo ${UNAME_MACHINE}-unknown- atheos1257 SEI:*:*:SEIUX) 1258 echo mips-sei-seiux${UNAME_RELEASE} 1259 exit 0 ;; 1260 *:DragonFly:*:*) 1261 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 1110 1262 exit 0 ;; 1111 1263 esac … … 1229 1381 EOF 1230 1382 1231 $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 1232 rm -f $dummy.c $dummy 1383 $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 1233 1384 1234 1385 # Apollos put the system type in the environment. -
abuse/trunk/config.sub
r2 r4 1 1 #! /bin/sh 2 2 # Configuration validation subroutine script. 3 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 20014 # Free Software Foundation, Inc.5 6 timestamp='200 1-10-05'3 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 4 # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. 5 6 timestamp='2004-03-12' 7 7 8 8 # This file is (in principle) common to ALL GNU software. … … 119 119 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` 120 120 case $maybe_os in 121 nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) 121 nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ 122 kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) 122 123 os=-$maybe_os 123 124 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` … … 228 229 | a29k \ 229 230 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ 231 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ 232 | am33_2.0 \ 230 233 | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ 231 234 | c4x | clipper \ 232 | d10v | d30v | d sp16xx \233 | fr30 \235 | d10v | d30v | dlx | dsp16xx \ 236 | fr30 | frv \ 234 237 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ 235 238 | i370 | i860 | i960 | ia64 \ 236 | m32r | m68000 | m68k | m88k | mcore \ 237 | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ 238 | mips64vr4100 | mips64vr4100el | mips64vr4300 \ 239 | mips64vr4300el | mips64vr5000 | mips64vr5000el \ 240 | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ 241 | mipsisa32 \ 239 | ip2k | iq2000 \ 240 | m32r | m32rle | m68000 | m68k | m88k | mcore \ 241 | mips | mipsbe | mipseb | mipsel | mipsle \ 242 | mips16 \ 243 | mips64 | mips64el \ 244 | mips64vr | mips64vrel \ 245 | mips64orion | mips64orionel \ 246 | mips64vr4100 | mips64vr4100el \ 247 | mips64vr4300 | mips64vr4300el \ 248 | mips64vr5000 | mips64vr5000el \ 249 | mipsisa32 | mipsisa32el \ 250 | mipsisa32r2 | mipsisa32r2el \ 251 | mipsisa64 | mipsisa64el \ 252 | mipsisa64r2 | mipsisa64r2el \ 253 | mipsisa64sb1 | mipsisa64sb1el \ 254 | mipsisa64sr71k | mipsisa64sr71kel \ 255 | mipstx39 | mipstx39el \ 242 256 | mn10200 | mn10300 \ 257 | msp430 \ 243 258 | ns16k | ns32k \ 244 | openrisc \259 | openrisc | or32 \ 245 260 | pdp10 | pdp11 | pj | pjl \ 246 261 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ 247 262 | pyramid \ 248 | s 390 | s390x\249 | sh | sh[34] | sh[34]eb | shbe | shle \250 | sparc | sparc64 | sparc let | sparclite| sparcv9 | sparcv9b \251 | st ormy16 | strongarm \252 | tahoe | thumb | tic 80 | tron \253 | v850 \263 | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ 264 | sh64 | sh64le \ 265 | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ 266 | strongarm \ 267 | tahoe | thumb | tic4x | tic80 | tron \ 268 | v850 | v850e \ 254 269 | we32k \ 255 | x86 | xscale \270 | x86 | xscale | xstormy16 | xtensa \ 256 271 | z8k) 257 272 basic_machine=$basic_machine-unknown … … 280 295 | a29k-* \ 281 296 | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ 282 | alphapca5[67]-* | arc-* \ 283 | arm-* | armbe-* | armle-* | armv*-* \ 297 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ 298 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ 299 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ 284 300 | avr-* \ 285 301 | bs2000-* \ 286 | c[123]* | c30-* | [cjt]90-* | c 54x-* \287 | clipper-* | c ray2-* | cydra-* \288 | d10v-* | d30v-* \302 | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ 303 | clipper-* | cydra-* \ 304 | d10v-* | d30v-* | dlx-* \ 289 305 | elxsi-* \ 290 | f30[01]-* | f700-* | fr30-* | f x80-* \306 | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ 291 307 | h8300-* | h8500-* \ 292 308 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ 293 309 | i*86-* | i860-* | i960-* | ia64-* \ 294 | m32r-* \ 295 | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ 310 | ip2k-* | iq2000-* \ 311 | m32r-* | m32rle-* \ 312 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ 296 313 | m88110-* | m88k-* | mcore-* \ 297 | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ 298 | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ 299 | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ 300 | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ 301 | none-* | np1-* | ns16k-* | ns32k-* \ 314 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ 315 | mips16-* \ 316 | mips64-* | mips64el-* \ 317 | mips64vr-* | mips64vrel-* \ 318 | mips64orion-* | mips64orionel-* \ 319 | mips64vr4100-* | mips64vr4100el-* \ 320 | mips64vr4300-* | mips64vr4300el-* \ 321 | mips64vr5000-* | mips64vr5000el-* \ 322 | mipsisa32-* | mipsisa32el-* \ 323 | mipsisa32r2-* | mipsisa32r2el-* \ 324 | mipsisa64-* | mipsisa64el-* \ 325 | mipsisa64r2-* | mipsisa64r2el-* \ 326 | mipsisa64sb1-* | mipsisa64sb1el-* \ 327 | mipsisa64sr71k-* | mipsisa64sr71kel-* \ 328 | mipstx39-* | mipstx39el-* \ 329 | msp430-* \ 330 | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ 302 331 | orion-* \ 303 332 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ … … 305 334 | pyramid-* \ 306 335 | romp-* | rs6000-* \ 307 | s390-* | s390x-* \ 308 | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ 309 | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ 310 | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ 311 | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ 312 | v850-* | vax-* \ 336 | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ 337 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ 338 | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ 339 | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ 340 | tahoe-* | thumb-* \ 341 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ 342 | tron-* \ 343 | v850-* | v850e-* | vax-* \ 313 344 | we32k-* \ 314 | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ 345 | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ 346 | xtensa-* \ 315 347 | ymp-* \ 316 348 | z8k-*) … … 332 364 os=-udi 333 365 ;; 366 abacus) 367 basic_machine=abacus-unknown 368 ;; 334 369 adobe68k) 335 370 basic_machine=m68010-adobe … … 346 381 os=-bsd 347 382 ;; 383 amd64) 384 basic_machine=x86_64-pc 385 ;; 386 amd64-*) 387 basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` 388 ;; 348 389 amdahl) 349 390 basic_machine=580-amdahl … … 377 418 os=-dynix 378 419 ;; 420 c90) 421 basic_machine=c90-cray 422 os=-unicos 423 ;; 379 424 convex-c1) 380 425 basic_machine=c1-convex … … 397 442 os=-bsd 398 443 ;; 399 cray | ymp)400 basic_machine= ymp-cray444 cray | j90) 445 basic_machine=j90-cray 401 446 os=-unicos 402 447 ;; 403 cray2) 404 basic_machine=cray2-cray 405 os=-unicos 406 ;; 407 [cjt]90) 408 basic_machine=${basic_machine}-cray 409 os=-unicos 448 cr16c) 449 basic_machine=cr16c-unknown 450 os=-elf 410 451 ;; 411 452 crds | unos) … … 415 456 basic_machine=cris-axis 416 457 ;; 458 crx) 459 basic_machine=crx-unknown 460 os=-elf 461 ;; 417 462 da30 | da30-*) 418 463 basic_machine=m68k-da30 … … 420 465 decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) 421 466 basic_machine=mips-dec 467 ;; 468 decsystem10* | dec10*) 469 basic_machine=pdp10-dec 470 os=-tops10 471 ;; 472 decsystem20* | dec20*) 473 basic_machine=pdp10-dec 474 os=-tops20 422 475 ;; 423 476 delta | 3300 | motorola-3300 | motorola-delta \ … … 601 654 os=-mint 602 655 ;; 603 mipsel*-linux*)604 basic_machine=mipsel-unknown605 os=-linux-gnu606 ;;607 mips*-linux*)608 basic_machine=mips-unknown609 os=-linux-gnu610 ;;611 656 mips3*-*) 612 657 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` … … 622 667 basic_machine=m68k-rom68k 623 668 os=-coff 669 ;; 670 morphos) 671 basic_machine=powerpc-unknown 672 os=-morphos 624 673 ;; 625 674 msdos) … … 695 744 basic_machine=np1-gould 696 745 ;; 746 nv1) 747 basic_machine=nv1-cray 748 os=-unicosmp 749 ;; 697 750 nsr-tandem) 698 751 basic_machine=nsr-tandem … … 702 755 os=-proelf 703 756 ;; 757 or32 | or32-*) 758 basic_machine=or32-unknown 759 os=-coff 760 ;; 761 os400) 762 basic_machine=powerpc-ibm 763 os=-os400 764 ;; 704 765 OSE68000 | ose68000) 705 766 basic_machine=m68000-ericsson … … 724 785 basic_machine=m68k-tti 725 786 ;; 726 787 pc532 | pc532-*) 727 788 basic_machine=ns32k-pc532 728 789 ;; … … 730 791 basic_machine=i586-pc 731 792 ;; 732 pentiumpro | p6 | 6x86 | athlon )793 pentiumpro | p6 | 6x86 | athlon | athlon_*) 733 794 basic_machine=i686-pc 734 795 ;; 735 pentiumii | pentium2 )796 pentiumii | pentium2 | pentiumiii | pentium3) 736 797 basic_machine=i686-pc 798 ;; 799 pentium4) 800 basic_machine=i786-pc 737 801 ;; 738 802 pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) … … 742 806 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` 743 807 ;; 744 pentiumii-* | pentium2-* )808 pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) 745 809 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` 810 ;; 811 pentium4-*) 812 basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` 746 813 ;; 747 814 pn) … … 751 818 ;; 752 819 ppc) basic_machine=powerpc-unknown 753 820 ;; 754 821 ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` 755 822 ;; 756 823 ppcle | powerpclittle | ppc-le | powerpc-little) 757 824 basic_machine=powerpcle-unknown 758 825 ;; 759 826 ppcle-* | powerpclittle-*) 760 827 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` 761 828 ;; 762 829 ppc64) basic_machine=powerpc64-unknown 763 830 ;; 764 831 ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` 765 832 ;; 766 833 ppc64le | powerpc64little | ppc64-le | powerpc64-little) 767 834 basic_machine=powerpc64le-unknown 768 835 ;; 769 836 ppc64le-* | powerpc64little-*) 770 837 basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` … … 787 854 basic_machine=romp-ibm 788 855 ;; 856 s390 | s390-*) 857 basic_machine=s390-ibm 858 ;; 859 s390x | s390x-*) 860 basic_machine=s390x-ibm 861 ;; 789 862 sa29200) 790 863 basic_machine=a29k-amd 791 864 os=-udi 792 865 ;; 866 sb1) 867 basic_machine=mipsisa64sb1-unknown 868 ;; 869 sb1el) 870 basic_machine=mipsisa64sb1el-unknown 871 ;; 872 sei) 873 basic_machine=mips-sei 874 os=-seiux 875 ;; 793 876 sequent) 794 877 basic_machine=i386-sequent … … 798 881 os=-hms 799 882 ;; 883 sh64) 884 basic_machine=sh64-unknown 885 ;; 800 886 sparclite-wrs | simso-wrs) 801 887 basic_machine=sparclite-wrs … … 865 951 ;; 866 952 t3e) 867 basic_machine=t3e-cray 953 basic_machine=alphaev5-cray 954 os=-unicos 955 ;; 956 t90) 957 basic_machine=t90-cray 868 958 os=-unicos 869 959 ;; … … 872 962 os=-coff 873 963 ;; 964 tic55x | c55x*) 965 basic_machine=tic55x-unknown 966 os=-coff 967 ;; 968 tic6x | c6x*) 969 basic_machine=tic6x-unknown 970 os=-coff 971 ;; 874 972 tx39) 875 973 basic_machine=mipstx39-unknown … … 878 976 basic_machine=mipstx39el-unknown 879 977 ;; 978 toad1) 979 basic_machine=pdp10-xkl 980 os=-tops20 981 ;; 880 982 tower | tower-32) 881 983 basic_machine=m68k-ncr 984 ;; 985 tpf) 986 basic_machine=s390x-ibm 987 os=-tpf 882 988 ;; 883 989 udi29k) … … 902 1008 ;; 903 1009 vpp*|vx|vx-*) 904 905 1010 basic_machine=f301-fujitsu 1011 ;; 906 1012 vxworks960) 907 1013 basic_machine=i960-wrs … … 924 1030 os=-proelf 925 1031 ;; 926 windows32) 927 basic_machine=i386-pc 928 os=-windows32-msvcrt 929 ;; 930 xmp) 931 basic_machine=xmp-cray 1032 xps | xps100) 1033 basic_machine=xps100-honeywell 1034 ;; 1035 ymp) 1036 basic_machine=ymp-cray 932 1037 os=-unicos 933 ;;934 xps | xps100)935 basic_machine=xps100-honeywell936 1038 ;; 937 1039 z8k-*-coff) … … 955 1057 basic_machine=hppa1.1-oki 956 1058 ;; 957 mips)958 if [ x$os = x-linux-gnu ]; then959 basic_machine=mips-unknown960 else961 basic_machine=mips-mips962 fi963 ;;964 1059 romp) 965 1060 basic_machine=romp-ibm … … 981 1076 basic_machine=we32k-att 982 1077 ;; 983 sh3 | sh4 | sh 3eb | sh4eb)1078 sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) 984 1079 basic_machine=sh-unknown 985 1080 ;; 986 sparc | sparcv9 | sparcv9b) 1081 sh64) 1082 basic_machine=sh64-unknown 1083 ;; 1084 sparc | sparcv8 | sparcv9 | sparcv9b) 987 1085 basic_machine=sparc-sun 988 1086 ;; 989 1087 cydra) 990 1088 basic_machine=cydra-cydrome 991 1089 ;; … … 1001 1099 pmac | pmac-mpw) 1002 1100 basic_machine=powerpc-apple 1003 ;;1004 c4x*)1005 basic_machine=c4x-none1006 os=-coff1007 1101 ;; 1008 1102 *-unknown) … … 1061 1155 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ 1062 1156 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ 1063 | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ 1064 | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ 1157 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ 1158 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ 1159 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ 1065 1160 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ 1066 1161 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ 1067 1162 | -chorusos* | -chorusrdb* \ 1068 1163 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ 1069 | -mingw32* | -linux-gnu* | - uxpv* | -beos* | -mpeix* | -udk* \1070 | -interix* | -uwin* | - rhapsody* | -darwin* | -opened* \1164 | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ 1165 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ 1071 1166 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ 1072 1167 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ 1073 | -os2* | -vos*) 1168 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ 1169 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ 1170 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) 1074 1171 # Remember, each alternative MUST END IN *, to match a version number. 1075 1172 ;; … … 1083 1180 esac 1084 1181 ;; 1182 -nto-qnx*) 1183 ;; 1085 1184 -nto*) 1086 os= -nto-qnx1185 os=`echo $os | sed -e 's|nto|nto-qnx|'` 1087 1186 ;; 1088 1187 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ … … 1093 1192 os=`echo $os | sed -e 's|mac|macos|'` 1094 1193 ;; 1194 -linux-dietlibc) 1195 os=-linux-dietlibc 1196 ;; 1095 1197 -linux*) 1096 1198 os=`echo $os | sed -e 's|linux|linux-gnu|'` … … 1105 1207 os=-openedition 1106 1208 ;; 1209 -os400*) 1210 os=-os400 1211 ;; 1107 1212 -wince*) 1108 1213 os=-wince … … 1123 1228 os=-aos 1124 1229 ;; 1230 -atheos*) 1231 os=-atheos 1232 ;; 1233 -syllable*) 1234 os=-syllable 1235 ;; 1125 1236 -386bsd) 1126 1237 os=-bsd … … 1129 1240 os=-sysv 1130 1241 ;; 1242 -nova*) 1243 os=-rtmk-nova 1244 ;; 1131 1245 -ns2 ) 1132 1246 os=-nextstep2 1133 1247 ;; 1134 1248 -nsk*) … … 1142 1256 os=-sysv4 1143 1257 ;; 1258 -tpf*) 1259 os=-tpf 1260 ;; 1144 1261 -triton*) 1145 1262 os=-sysv3 … … 1169 1286 os=-xenix 1170 1287 ;; 1171 -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) 1172 os=-mint 1288 -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) 1289 os=-mint 1290 ;; 1291 -aros*) 1292 os=-aros 1293 ;; 1294 -kaos*) 1295 os=-kaos 1173 1296 ;; 1174 1297 -none) … … 1203 1326 os=-aout 1204 1327 ;; 1328 c4x-* | tic4x-*) 1329 os=-coff 1330 ;; 1331 # This must come before the *-dec entry. 1205 1332 pdp10-*) 1206 1333 os=-tops20 1207 1334 ;; 1208 1335 pdp11-*) 1209 1336 os=-none 1210 1337 ;; … … 1233 1360 os=-elf 1234 1361 ;; 1362 or32-*) 1363 os=-coff 1364 ;; 1235 1365 *-tti) # must be before sparc entry or we get the wrong os. 1236 1366 os=-sysv3 … … 1296 1426 os=-nextstep3 1297 1427 ;; 1298 1428 *-gould) 1299 1429 os=-sysv 1300 1430 ;; 1301 1431 *-highlevel) 1302 1432 os=-bsd 1303 1433 ;; … … 1305 1435 os=-bsd 1306 1436 ;; 1307 1437 *-sgi) 1308 1438 os=-irix 1309 1439 ;; 1310 1440 *-siemens) 1311 1441 os=-sysv4 1312 1442 ;; … … 1377 1507 vendor=ibm 1378 1508 ;; 1509 -os400*) 1510 vendor=ibm 1511 ;; 1379 1512 -ptx*) 1380 1513 vendor=sequent 1381 1514 ;; 1382 -vxsim* | -vxworks*) 1515 -tpf*) 1516 vendor=ibm 1517 ;; 1518 -vxsim* | -vxworks* | -windiss*) 1383 1519 vendor=wrs 1384 1520 ;; -
abuse/trunk/libtool
r2 r4 36 36 # ### BEGIN LIBTOOL CONFIG 37 37 38 # Libtool was configured on host Milamber:38 # Libtool was configured on host poukram: 39 39 40 40 # Shell to use when invoking shell scripts. … … 71 71 72 72 # The linker used to build libraries. 73 LD="/usr/ i386-slackware-linux/bin/ld"73 LD="/usr/bin/ld" 74 74 75 75 # Whether we need hard or soft links. -
abuse/trunk/src/chars.cpp
r2 r4 413 413 { 414 414 lprint(lcar(field)); 415 lbreak("Unknown field for character defini ltion");415 lbreak("Unknown field for character definition"); 416 416 exit(0); 417 417 } -
abuse/trunk/src/collide.cpp
r2 r4 148 148 { 149 149 game_object *target,*rec,*subject; 150 long sx1,sy1,sx2,sy2,tx1,ty1,tx2,ty2,hitx ,hity,t_centerx;150 long sx1,sy1,sx2,sy2,tx1,ty1,tx2,ty2,hitx=0,hity=0,t_centerx; 151 151 152 152 for (int l=0;l<attack_total;l++) -
abuse/trunk/src/cop.cpp
r2 r4 143 143 (o->otype==S_ROCKET_TOP ? large_fire_off : 144 144 (o->otype==S_BFG_TOP ? large_fire_off : small_fire_off)); 145 signed char *f=fire_off,*fb ;146 int best_diff=200,best_num ;145 signed char *f=fire_off,*fb=NULL; 146 int best_diff=200,best_num=0; 147 147 int iy=f[1],ix=f[6*2]; 148 148 … … 836 836 case run_jump_fall : o->state=(character_state)S_fast_run_jump_fall; break; 837 837 case end_run_jump : o->state=(character_state)S_fast_end_run_jump; break; 838 default: break; 838 839 } 839 840 … … 855 856 case run_jump_fall : o->state=(character_state)S_fly_run_jump_fall; break; 856 857 case end_run_jump : o->state=(character_state)S_fly_end_run_jump; break; 858 default: break; 857 859 } 858 860 -
abuse/trunk/src/demo.cpp
r2 r4 117 117 } 118 118 } break; 119 default : 120 break; 119 121 } 120 122 } … … 209 211 210 212 } break; 213 default : 214 break; 211 215 } 212 216 -
abuse/trunk/src/dev.cpp
r2 r4 2003 2003 } 2004 2004 } 2005 default: 2006 break; 2005 2007 } 2006 2008 -
abuse/trunk/src/game.cpp
r2 r4 545 545 spec_directory sd(fp); 546 546 547 #if 0 547 548 spec_entry *e=sd.find("Copyright 1995 Crack dot Com, All Rights reserved"); 548 549 if (!e) … … 553 554 } 554 555 else 556 #endif 555 557 current_level=new level(&sd,fp,name); 556 558 delete fp; … … 1421 1423 char *fastpath; 1422 1424 fastpath = (char *)jmalloc( strlen( get_save_filename_prefix() ) + 13, "fastpath" ); 1423 sprintf( fastpath, "%sfastload.dat \0", get_save_filename_prefix() );1425 sprintf( fastpath, "%sfastload.dat", get_save_filename_prefix() ); 1424 1426 fast_load_start_recording( fastpath ); 1425 1427 load_data(argc,argv); -
abuse/trunk/src/gamma.cpp
r2 r4 180 180 181 181 gammapath = (char *)jmalloc( strlen( get_save_filename_prefix() ) + 10, "gammapath" ); 182 sprintf( gammapath, "%sgamma.lsp \0", get_save_filename_prefix() );182 sprintf( gammapath, "%sgamma.lsp", get_save_filename_prefix() ); 183 183 fp = open_FILE( gammapath, "wb" ); 184 184 if( fp ) -
abuse/trunk/src/imlib/dprint.cpp
r2 r4 21 21 if (dprint_fun) 22 22 { 23 char st[1000],a,*sp; 24 int y; 23 char st[1000]; 25 24 va_list ap; 26 25 -
abuse/trunk/src/imlib/filesel.cpp
r2 r4 57 57 int i=0; 58 58 for (;i<tf;i++) 59 if ( strlen(f[i])>wid) wid=strlen(f[i]);59 if ((int)strlen(f[i])>wid) wid=strlen(f[i]); 60 60 for (i=0;i<td;i++) 61 if ( strlen(d[i])+2>wid) wid=strlen(d[i])+2;61 if ((int)strlen(d[i])+2>wid) wid=strlen(d[i])+2; 62 62 sx=0; 63 63 … … 103 103 int i=0; 104 104 for (;i<tf;i++) 105 if ( strlen(f[i])>wid) wid=strlen(f[i]);105 if ((int)strlen(f[i])>wid) wid=strlen(f[i]); 106 106 for (i=0;i<td;i++) 107 if ( strlen(d[i])+2>wid) wid=strlen(d[i])+2;107 if ((int)strlen(d[i])+2>wid) wid=strlen(d[i])+2; 108 108 reconfigure(); 109 109 } -
abuse/trunk/src/imlib/fonts.cpp
r2 r4 37 37 void JCFont::put_char(image *screen, int x, int y, char ch, int color) 38 38 { 39 if (let[ ch])39 if (let[(int)ch]) 40 40 { 41 41 if (color>=0) 42 let[ ch]->put_color(screen,x,y,color);43 else let[ ch]->put_image(screen,x,y);42 let[(int)ch]->put_color(screen,x,y,color); 43 else let[(int)ch]->put_image(screen,x,y); 44 44 } 45 45 } -
abuse/trunk/src/imlib/gifread.cpp
r2 r4 38 38 char buf[100],er; 39 39 unsigned char sep; 40 int ncolors;40 unsigned int ncolors; 41 41 FILE *fp; 42 42 image *im; -
abuse/trunk/src/imlib/include.cpp
r2 r4 6 6 char tmp_name[200]; 7 7 strcpy(tmp_name,name); 8 int j,append=0,i; 8 unsigned int j; 9 int append=0,i; 9 10 for (j=0;j<strlen(name);j++) 10 11 if (toupper(tmp_name[j])<'A' || toupper(tmp_name[j])>'Z') -
abuse/trunk/src/imlib/input.cpp
r2 r4 257 257 case JK_LEFT : if (cur) { draw_cur(wm->dark_color(),screen,wm); cur--; 258 258 draw_cur(wm->bright_color(),screen,wm); } break; 259 case JK_RIGHT : if (cur< strlen(format)-1) { draw_cur(wm->dark_color(),screen,wm); cur++;259 case JK_RIGHT : if (cur<(int)strlen(format)-1) { draw_cur(wm->dark_color(),screen,wm); cur++; 260 260 draw_cur(wm->bright_color(),screen,wm); } break; 261 261 case JK_END : if (cur!=last_spot()) 262 262 { draw_cur(wm->dark_color(),screen,wm); cur=last_spot(); 263 if (cur== strlen(format)-1) cur--;263 if (cur==(int)strlen(format)-1) cur--; 264 264 draw_cur(wm->bright_color(),screen,wm); } break; 265 265 case JK_HOME : if (cur) … … 268 268 case JK_BACKSPACE : if (cur) 269 269 { draw_cur(wm->dark_color(),screen,wm); cur--; 270 for (xx=cur;xx< strlen(format)-1;xx++)270 for (xx=cur;xx<(int)strlen(format)-1;xx++) 271 271 data[xx]=data[xx+1]; 272 272 data[strlen(format)-1]=' '; … … 281 281 data[xx]=data[xx-1]; 282 282 data[cur]=ev.key; 283 if (cur< strlen(format)-1)283 if (cur<(int)strlen(format)-1) 284 284 cur++; 285 285 data[strlen(format)]=0; … … 335 335 { 336 336 char num[20]; 337 sprintf(num,"% Lg",Data);337 sprintf(num,"%g",Data); 338 338 int slen=(strlen(Format)>strlen(num) ? strlen(Format) : strlen(num)); 339 339 x=X; y=Y; id=ID; -
abuse/trunk/src/imlib/jmalloc.cpp
r2 r4 169 169 for (;f;f=f->next); // scan through static big list 170 170 171 int i,bit ;171 int i,bit=1; 172 172 for (i=0;i<JM_SMALL_SIZE;i++) 173 173 { … … 215 215 { 216 216 fprintf(fp,"*** Small Block size = %d ***\n",i); 217 unsigned long x=0,bit=1;217 unsigned long bit=1; 218 218 char *addr=((char *)(s+1)); 219 219 for (int j=0;j<32;j++) … … 252 252 { 253 253 fprintf(fp,"*** Small Block size = %d ***\n",i); 254 unsigned long x=0,bit=1;254 unsigned long bit=1; 255 255 char *addr=((char *)(s+1)); 256 256 for (int j=0;j<32;j++) … … 348 348 } else 349 349 { 350 int bit=1,i=0 ,offset=0;350 int bit=1,i=0; 351 351 char *addr=((char *)s)+sizeof(small_block); 352 352 while (1) // we already know there is a bit free … … 380 380 s->size=-s->size; 381 381 382 if (s->size-size> sizeof(memory_node)+4) // is there enough space to split the block?382 if (s->size-size>(int)sizeof(memory_node)+4) // is there enough space to split the block? 383 383 { 384 384 memory_node *p=(memory_node *)((char *)s+sizeof(memory_node)+size); … … 431 431 } else 432 432 { 433 int bit=1,i=0 ,offset=0;433 int bit=1,i=0; 434 434 char *addr=((char *)s)+sizeof(small_block); 435 435 while (1) // we already know there is a bit free … … 486 486 s->size=-s->size; 487 487 488 if (s->size-size> sizeof(memory_node)+4) // is there enough space to split the block?488 if (s->size-size>(int)sizeof(memory_node)+4) // is there enough space to split the block? 489 489 { 490 490 memory_node *p=s; // store this position … … 882 882 char *reportpath; 883 883 reportpath = (char *)jmalloc( strlen( get_save_filename_prefix() ) + strlen( filename ), "reportpath" ); 884 sprintf( reportpath, "%s%s \0", get_save_filename_prefix(), filename );884 sprintf( reportpath, "%s%s", get_save_filename_prefix(), filename ); 885 885 886 886 FILE *fp = fopen( reportpath, "wb" ); -
abuse/trunk/src/imlib/jwindow.cpp
r2 r4 176 176 if (red) 177 177 { 178 jwindow *j=ev.window ,*p;178 jwindow *j=ev.window; 179 179 /* screen->add_dirty(j->x,j->y,j->x+j->l-1,j->y+j->h-1); 180 180 for (p=first;p!=j;p=p->next) … … 283 283 jwindow *p,*q; 284 284 285 int mx ,my,but;286 image *mouse_pic ,*mouse_save;285 int mx=0,my=0; 286 image *mouse_pic=NULL,*mouse_save=NULL; 287 287 288 288 if (has_mouse()) … … 427 427 ifield *input_manager::unlink(int id) // unlinks ID from fields list and return the pointer to it 428 428 { 429 for (ifield *i=first,*last ;i;i=i->next)429 for (ifield *i=first,*last=NULL;i;i=i->next) 430 430 { 431 431 if (i->id==id) -
abuse/trunk/src/imlib/keys.cpp
r2 r4 12 12 void key_name(int key, char *buffer) 13 13 { 14 static char sing[2];14 //static char sing[2]; 15 15 if( key > 255 && key <= JK_MAX_KEY ) 16 16 strcpy(buffer,jk_key_names[key-256]); -
abuse/trunk/src/imlib/lbmread.cpp
r2 r4 30 30 else 31 31 { 32 long offset=12,ssize;32 long ssize; 33 33 char stype[4]; 34 34 short w=0,h=0,x,y,tcolor,pagew,pageh; 35 char planes,masking,compr ,padl,xa,ya;35 char planes,masking,compr=0,padl,xa,ya; 36 36 37 37 while (ftell(fp)+4<size) … … 63 63 if (im) delete im; // shouldn't be two BODY's butjust in case... 64 64 im=new image(w,h); 65 int x,y;65 int y; 66 66 if (!compr) 67 67 { -
abuse/trunk/src/imlib/palette.cpp
r2 r4 482 482 brv=0; bri=0; 483 483 484 for (i=0;i< ncolors;i++)484 for (i=0;i<(unsigned int)ncolors;i++) 485 485 { if (all || used(i)) 486 486 { … … 502 502 brv=(long)258*(long)258*(long)258; bri=0; 503 503 504 for (i=0;i< ncolors;i++)504 for (i=0;i<(unsigned int)ncolors;i++) 505 505 { if (all || used(i)) 506 506 { -
abuse/trunk/src/imlib/pmenu.cpp
r2 r4 276 276 277 277 278 int total=0,t x,tw,i=0,x;278 int total=0,tw,i=0,x=0; 279 279 for (pmenu_item *pp=top;pp;pp=pp->next,i++) 280 280 { if (pp==p) x=i; -
abuse/trunk/src/imlib/scroller.cpp
r2 r4 348 348 { 349 349 screen->bar(x,y,x+l-1,y+h-1,wm->black()); 350 int xa,ya,xo ,yo;350 int xa,ya,xo=0,yo; 351 351 if (vert) { xa=0; ya=30; yo=x+5; yo=y+5; } else { xa=30; ya=0; xo=x+5; yo=y+5; } 352 352 for (int i=newx,c=0;c<30 && i<100;i++,c++) … … 391 391 392 392 for (i=0;i<t;i++) 393 if ( strlen(List[i])>wid)393 if ((int)strlen(List[i])>wid) 394 394 wid=strlen(List[i]); 395 395 cur_sel=sx=start_yoffset; … … 426 426 int found=-1; 427 427 if (key_hist_total<20) 428 key_hist[ key_hist_total++]=ev.key;428 key_hist[(int)(key_hist_total++)]=ev.key; 429 429 430 430 for (int i=0;i<t && found==-1;i++) 431 431 { 432 if ( strlen(lis[i].name)>=key_hist_total && memcmp(lis[i].name,key_hist,key_hist_total)==0)432 if ((int)strlen(lis[i].name)>=key_hist_total && memcmp(lis[i].name,key_hist,key_hist_total)==0) 433 433 found=i; 434 434 } … … 480 480 int tw=(l+tex->width()-1)/tex->width(); 481 481 int th=(h+tex->height()-1)/tex->height(); 482 int dy=y ,dx;482 int dy=y; 483 483 for (int j=0;j<th;j++,dy+=tex->height()) 484 484 for (int i=0,dx=x;i<tw;i++,dx+=tex->width()) -
abuse/trunk/src/imlib/specs.cpp
r2 r4 151 151 if (wbuf_end!=0) 152 152 { 153 long ret=unbuffered_write(wbuf,wbuf_end);153 unsigned long ret=unbuffered_write(wbuf,wbuf_end); 154 154 if (ret!=wbuf_end && no_space_handle_fun) 155 155 no_space_handle_fun(); … … 172 172 if (rbuf_start<rbuf_end) 173 173 { 174 int avail_size=rbuf_end-rbuf_start;174 unsigned int avail_size=rbuf_end-rbuf_start; 175 175 int copy_size=avail_size>count ? count : avail_size; 176 176 memcpy(buf,rbuf+rbuf_start,copy_size); … … 209 209 buf=(void *)(((char *)buf)+copy_size); 210 210 if (wbuf_end==wbuf_size) 211 if ( flush_writes()!=wbuf_size)211 if ((unsigned int)flush_writes()!=wbuf_size) 212 212 return total_written; 213 213 … … 217 217 } else 218 218 { 219 long ret=unbuffered_write(buf,count);219 unsigned long ret=unbuffered_write(buf,count); 220 220 if (ret!=count && no_space_handle_fun) 221 221 no_space_handle_fun(); … … 234 234 else if (whence==SEEK_END) offset=file_size()-offset; 235 235 236 if (offset<realpos- rbuf_end || offset>=realpos)236 if (offset<realpos-(long)rbuf_end || offset>=realpos) 237 237 { 238 238 rbuf_start=rbuf_end=0; … … 270 270 #if (defined(__APPLE__) && !defined(__MACH__)) 271 271 spec_main_jfile.open_external(filename,"rb",O_BINARY|O_RDONLY); 272 spec_main_fd = spec_main_jfile.get_fd();273 spec_main_sd.startup(&spec_main_jfile);274 272 #else 275 273 spec_main_jfile.open_external(filename,"rb",O_RDONLY); 274 #endif 276 275 spec_main_fd = spec_main_jfile.get_fd(); 276 if (spec_main_fd==-1) 277 return; 277 278 spec_main_sd.startup(&spec_main_jfile); 278 #endif279 279 } 280 280 … … 335 335 { 336 336 skip_size=1; 337 int errval = unlink(tmp_name);337 //int errval = unlink(tmp_name); 338 338 } 339 339 … … 487 487 int jFILE::unbuffered_read(void *buf, size_t count) 488 488 { 489 long len;489 unsigned long len; 490 490 491 491 if (fd == spec_main_fd) … … 505 505 len = ::read(fd,(char*)buf,count); 506 506 ::write(fast_load_fd,(char*)&len,sizeof(len)); 507 ::write(fast_load_fd,(char*)buf, count);507 ::write(fast_load_fd,(char*)buf,len); 508 508 break; 509 509 case 2: … … 525 525 len = ::read(fd,(char*)buf,count); 526 526 ::write(fast_load_fd,(char*)&len,sizeof(len)); 527 ::write(fast_load_fd,(char*)buf, count);527 ::write(fast_load_fd,(char*)buf,len); 528 528 break; 529 529 case 2: … … 755 755 { 756 756 char buf[256]; 757 memset(buf,0,256); 757 758 fp->read(buf,8); 758 759 buf[9]=0; -
abuse/trunk/src/imlib/targa.cpp
r2 r4 55 55 int x,y; 56 56 unsigned char ctrl; 57 unsigned char bgra[4],*sl,c,lr ,lg,lb,ll=0,lc;57 unsigned char bgra[4],*sl,c,lr=0,lg=0,lb=0,ll=0,lc=0; 58 58 59 59 -
abuse/trunk/src/imlib/xwdread.cpp
r2 r4 140 140 X11WDFileHeader *h11P; 141 141 char junk[800]; 142 int i, dummy1, dummy2, dummy3; 142 unsigned int i; 143 int dummy1, dummy2, dummy3; 143 144 unsigned short minred, maxred; 144 145 X11XColor x11col; -
abuse/trunk/src/innet.cpp
r2 r4 490 490 spec_directory sd(fp); 491 491 492 #if 0 492 493 spec_entry *e=sd.find("Copyright 1995 Crack dot Com, All Rights reserved"); 493 494 if (!e) … … 498 499 } 499 500 else 501 #endif 500 502 current_level=new level(&sd,fp,NET_STARTFILE); 501 503 -
abuse/trunk/src/lcache.cpp
r2 r4 110 110 { 111 111 long x=abs(t); 112 cons_cell *last ,*first=NULL;112 cons_cell *last=NULL,*first=NULL; 113 113 while (x) 114 114 { -
abuse/trunk/src/light.cpp
r2 r4 204 204 char *lightpath; 205 205 lightpath = (char *)jmalloc( strlen( get_save_filename_prefix() ) + 9, "lightpath" ); 206 sprintf( lightpath, "%slight.tbl \0", get_save_filename_prefix() );206 sprintf( lightpath, "%slight.tbl", get_save_filename_prefix() ); 207 207 208 208 bFILE *fp=open_file( lightpath, "rb" ); … … 1219 1219 long t=fp->read_long(); 1220 1220 min_light_level=fp->read_long(); 1221 light_source *last ;1221 light_source *last=NULL; 1222 1222 while (t) 1223 1223 { -
abuse/trunk/src/lisp.cpp
r2 r4 932 932 if (l1!=0) 933 933 { 934 void *first=NULL,*last=NULL,*cur=NULL ;934 void *first=NULL,*last=NULL,*cur=NULL,*tmp; 935 935 p_ref r1(first),r2(last),r3(cur); 936 936 while (list1) … … 943 943 944 944 cons_cell *cell=new_cons_cell(); 945 ((cons_cell *)cell)->car=lcar(list1); 946 ((cons_cell *)cell)->cdr=lcar(list2); 945 tmp=lcar(list1); 946 ((cons_cell *)cell)->car=tmp; 947 tmp=lcar(list2); 948 ((cons_cell *)cell)->cdr=tmp; 947 949 ((cons_cell *)cur)->car=cell; 948 950 … … 1151 1153 else if (n[0]=='\'') // short hand for quote function 1152 1154 { 1153 void *cs=new_cons_cell(),*c2=NULL ;1155 void *cs=new_cons_cell(),*c2=NULL,*tmp; 1154 1156 p_ref r1(cs),r2(c2); 1155 1157 1156 1158 ((cons_cell *)cs)->car=quote_symbol; 1157 1159 c2=new_cons_cell(); 1158 ((cons_cell *)c2)->car=compile(s); 1160 tmp=compile(s); 1161 ((cons_cell *)c2)->car=tmp; 1159 1162 ((cons_cell *)c2)->cdr=NULL; 1160 1163 ((cons_cell *)cs)->cdr=c2; … … 1163 1166 else if (n[0]=='`') // short hand for backquote function 1164 1167 { 1165 void *cs=new_cons_cell(),*c2=NULL ;1168 void *cs=new_cons_cell(),*c2=NULL,*tmp; 1166 1169 p_ref r1(cs),r2(c2); 1167 1170 1168 1171 ((cons_cell *)cs)->car=backquote_symbol; 1169 1172 c2=new_cons_cell(); 1170 ((cons_cell *)c2)->car=compile(s); 1173 tmp=compile(s); 1174 ((cons_cell *)c2)->car=tmp; 1171 1175 ((cons_cell *)c2)->cdr=NULL; 1172 1176 ((cons_cell *)cs)->cdr=c2; … … 1174 1178 } else if (n[0]==',') // short hand for comma function 1175 1179 { 1176 void *cs=new_cons_cell(),*c2=NULL ;1180 void *cs=new_cons_cell(),*c2=NULL,*tmp; 1177 1181 p_ref r1(cs),r2(c2); 1178 1182 1179 1183 ((cons_cell *)cs)->car=comma_symbol; 1180 1184 c2=new_cons_cell(); 1181 ((cons_cell *)c2)->car=compile(s); 1185 tmp=compile(s); 1186 ((cons_cell *)c2)->car=tmp; 1182 1187 ((cons_cell *)c2)->cdr=NULL; 1183 1188 ((cons_cell *)cs)->cdr=c2; … … 1207 1212 else 1208 1213 { 1214 void *tmp; 1209 1215 read_ltoken(s,n); // skip the '.' 1210 ((cons_cell *)last)->cdr=compile(s); // link the last cdr to 1216 tmp=compile(s); 1217 ((cons_cell *)last)->cdr=tmp; // link the last cdr to 1211 1218 last=NULL; 1212 1219 } … … 1215 1222 else 1216 1223 { 1224 void *tmp; 1217 1225 cur=new_cons_cell(); 1218 1226 p_ref r1(cur); 1219 1227 if (!first) first=cur; 1220 ((cons_cell *)cur)->car=compile(s); 1228 tmp=compile(s); 1229 ((cons_cell *)cur)->car=tmp; 1221 1230 if (last) 1222 1231 ((cons_cell *)last)->cdr=cur; … … 1266 1275 else if (n[1]==0) // short hand for function 1267 1276 { 1268 void *cs=new_cons_cell(),*c2=NULL ;1277 void *cs=new_cons_cell(),*c2=NULL,*tmp; 1269 1278 p_ref r4(cs),r5(c2); 1270 ((cons_cell *)cs)->car=make_find_symbol("function"); 1279 tmp=make_find_symbol("function"); 1280 ((cons_cell *)cs)->car=tmp; 1271 1281 c2=new_cons_cell(); 1272 ((cons_cell *)c2)->car=compile(s); 1282 tmp=compile(s); 1283 ((cons_cell *)c2)->car=tmp; 1273 1284 ((cons_cell *)cs)->cdr=c2; 1274 1285 ret=cs; … … 1279 1290 exit(0); 1280 1291 } 1281 } else return make_find_symbol(n); 1292 } else { 1293 ret = make_find_symbol(n); 1294 } 1282 1295 return ret; 1283 1296 } … … 1527 1540 case L_C_FUNCTION : 1528 1541 { 1529 void *first=NULL,*cur=NULL ;1542 void *first=NULL,*cur=NULL,*tmp; 1530 1543 p_ref r1(first),r2(cur); 1531 1544 while (arg_list) 1532 1545 { 1533 if (first) 1534 cur=((cons_cell *)cur)->cdr=new_cons_cell(); 1535 else 1546 if (first) { 1547 tmp=new_cons_cell(); 1548 ((cons_cell *)cur)->cdr=tmp; 1549 cur=tmp; 1550 } else 1536 1551 cur=first=new_cons_cell(); 1537 1552 … … 1544 1559 case L_C_BOOL : 1545 1560 { 1546 void *first=NULL,*cur=NULL ;1561 void *first=NULL,*cur=NULL,*tmp; 1547 1562 p_ref r1(first),r2(cur); 1548 1563 while (arg_list) 1549 1564 { 1550 if (first) 1551 cur=((cons_cell *)cur)->cdr=new_cons_cell(); 1552 else 1565 if (first) { 1566 tmp=new_cons_cell(); 1567 ((cons_cell *)cur)->cdr=tmp; 1568 cur=tmp; 1569 } else 1553 1570 cur=first=new_cons_cell(); 1554 1571 … … 1563 1580 } break; 1564 1581 default : 1565 fprintf(stderr,"not a fun, sho ldn't happed\n");1582 fprintf(stderr,"not a fun, shouldn't happen\n"); 1566 1583 } 1567 1584 … … 1782 1799 else 1783 1800 { 1784 void *first=NULL,*last=NULL,*cur=NULL ;1801 void *first=NULL,*last=NULL,*cur=NULL,*tmp; 1785 1802 p_ref ref1(first),ref2(last),ref3(cur),ref4(args); 1786 1803 while (args) … … 1790 1807 if (CAR(args)==comma_symbol) // dot list with a comma? 1791 1808 { 1792 ((cons_cell *)last)->cdr=eval(CAR(CDR(args))); 1809 tmp=eval(CAR(CDR(args))); 1810 ((cons_cell *)last)->cdr=tmp; 1793 1811 args=NULL; 1794 1812 } … … 1801 1819 first=cur; 1802 1820 last=cur; 1803 ((cons_cell *)cur)->car=backquote_eval(CAR(args)); 1821 tmp=backquote_eval(CAR(args)); 1822 ((cons_cell *)cur)->car=tmp; 1804 1823 args=CDR(args); 1805 1824 } 1806 1825 } else 1807 1826 { 1808 ((cons_cell *)last)->cdr=backquote_eval(args); 1827 tmp=backquote_eval(args); 1828 ((cons_cell *)last)->cdr=tmp; 1809 1829 args=NULL; 1810 1830 } … … 2106 2126 while (var_list) 2107 2127 { 2108 void *var_name=CAR(CAR(var_list)) ;2128 void *var_name=CAR(CAR(var_list)),*tmp; 2109 2129 #ifdef TYPE_CHECKING 2110 2130 if (item_type(var_name)!=L_SYMBOL) … … 2117 2137 2118 2138 l_user_stack.push(((lisp_symbol *)var_name)->value); 2119 ((lisp_symbol *)var_name)->value=eval(CAR(CDR(CAR(var_list)))); 2139 tmp=eval(CAR(CDR(CAR(var_list)))); 2140 ((lisp_symbol *)var_name)->value=tmp; 2120 2141 var_list=CDR(var_list); 2121 2142 } … … 2378 2399 char *gammapath; 2379 2400 gammapath = (char *)jmalloc( strlen( get_save_filename_prefix() ) + 10, "gammapath" ); 2380 sprintf( gammapath, "%sgamma.lsp \0", get_save_filename_prefix() );2401 sprintf( gammapath, "%sgamma.lsp", get_save_filename_prefix() ); 2381 2402 fp = new jFILE( gammapath, "rb" ); 2382 2403 jfree( gammapath ); -
abuse/trunk/src/lisp_gc.cpp
r2 r4 79 79 inline void *collect_cons_cell(void *x) 80 80 { 81 cons_cell *last=NULL,*first ;81 cons_cell *last=NULL,*first=NULL; 82 82 if (!x) return x; 83 83 for (;x && item_type(x)==L_CONS_CELL;) -
abuse/trunk/src/loader2.cpp
r2 r4 284 284 int should_save_sd_cache = 0; 285 285 286 # if 0 286 287 char *cachepath; 287 288 cachepath = (char *)jmalloc( strlen( get_save_filename_prefix() ) + 12, "cachepath" ); 288 sprintf( cachepath, "%ssd_cache.tmp \0", get_save_filename_prefix() );289 sprintf( cachepath, "%ssd_cache.tmp", get_save_filename_prefix() ); 289 290 290 291 bFILE *load = open_file( cachepath, "rb" ); … … 298 299 } 299 300 delete load; 301 #endif 300 302 301 303 if (!net_start()) // don't let them specify a startup file we are connect elsewhere … … 444 446 b_hi=cash.backt(backtiles[0])->im->height(); 445 447 448 #if 0 446 449 if( should_save_sd_cache ) 447 450 { … … 453 456 delete save; 454 457 } 458 #endif 455 459 456 460 sd_cache.clear(); 457 461 past_startup = 1; 462 #if 0 458 463 jfree( cachepath ); 464 #endif 459 465 } 460 466 -
abuse/trunk/src/loadgame.cpp
r2 r4 192 192 total_saved=MAX_SAVE_GAMES; 193 193 194 int i,ih=cash.img(save_buts[0])->height(); 195 /* ico_button *buts[MAX_SAVE_GAMES]; 194 int i; 195 /* int ih=cash.img(save_buts[0])->height(); 196 ico_button *buts[MAX_SAVE_GAMES]; 196 197 int y=WINDOW_FRAME_TOP; 197 198 -
abuse/trunk/src/net/gserver.cpp
r2 r4 458 458 player_client *d=c; 459 459 c=c->next; 460 delete c;460 delete d; 461 461 } 462 462 player_list=NULL; -
abuse/trunk/src/net/include/fileman.hpp
r2 r4 19 19 int file_fd; 20 20 21 nfs_client *next; 21 22 long size_to_read; 22 23 long size; 23 nfs_client *next;24 24 nfs_client(net_socket *sock, int file_fd, nfs_client *next); 25 25 int send_read(); // flushes as much of size_to_read as possible -
abuse/trunk/src/net/include/gserver.hpp
r2 r4 36 36 void set_need_reload_start_ok(int x) { set_flag(Need_reload_start_ok,x); } 37 37 38 int client_id; 38 39 net_socket *comm; 39 int client_id;40 40 net_address *data_address; 41 41 player_client *next; -
abuse/trunk/src/net/include/tcpip.hpp
r2 r4 85 85 typedef isllist<RequestItem *>::iterator p_request; 86 86 isllist<RequestItem*> servers,returned; 87 net_socket *responder;88 ip_address *bcast;89 87 90 88 // Notification Data … … 92 90 char notify_data[512]; 93 91 int notify_len; 92 93 net_socket *responder; 94 ip_address *bcast; 94 95 95 96 int handle_notification(); -
abuse/trunk/src/net/tcpip.cpp
r2 r4 99 99 char my_name[100]; // check to see if this address is 'hostname' 100 100 gethostname(my_name,100); 101 ip_address *ret = 0;101 //ip_address *ret = 0; 102 102 103 103 if (my_name[0]<'0' || my_name[0]>'9') … … 379 379 buf[len] = 0; 380 380 if (strcmp(buf, notify_signature)==0) { 381 #ifdef TCPIP_DEBUG 381 382 char s[256]; 382 #ifdef TCPIP_DEBUG383 383 addr->store_string(s,256); 384 384 printf("responding to %s",s); … … 537 537 if (!found) 538 538 { 539 #ifdef TCPIP_DEBUG 539 540 char s[256]; 541 #endif 540 542 RequestItem *r = new RequestItem; 541 543 r->addr = addr; -
abuse/trunk/src/netcfg.cpp
r2 r4 59 59 case RESTART_SINGLE : 60 60 return 1; 61 default: 62 break; 61 63 } 62 64 return 0; … … 70 72 case RESTART_CLIENT : { state=CLIENT; } break; 71 73 case RESTART_SINGLE : { state=SINGLE_PLAYER; } break; 74 default: break; 72 75 } 73 76 -
abuse/trunk/src/nfclient.cpp
r2 r4 135 135 { 136 136 long a=NF_read(nfs_fd,buf,count); 137 if (a> count)137 if (a>(long)count) 138 138 { 139 139 fprintf(stderr,"ooch read too much\n"); -
abuse/trunk/src/objects.cpp
r2 r4 404 404 void *m=mark_heap(TMP_SPACE); 405 405 406 time_marker *prof1 ;406 time_marker *prof1=NULL; 407 407 if (profiling()) 408 408 prof1=new time_marker; … … 503 503 ((cons_cell *)px)->cdr=py; 504 504 505 time_marker *prof1 ;505 time_marker *prof1=NULL; 506 506 if (profiling()) 507 507 prof1=new time_marker; … … 618 618 619 619 void *m=mark_heap(TMP_SPACE); 620 time_marker *prof1 ;620 time_marker *prof1=NULL; 621 621 if (profiling()) 622 622 prof1=new time_marker; … … 645 645 646 646 void *m=mark_heap(TMP_SPACE); 647 time_marker *prof1 ;647 time_marker *prof1=NULL; 648 648 if (profiling()) 649 649 prof1=new time_marker; … … 1152 1152 void *m=mark_heap(TMP_SPACE); 1153 1153 1154 time_marker *prof1 ;1154 time_marker *prof1=NULL; 1155 1155 if (profiling()) 1156 1156 prof1=new time_marker; … … 1219 1219 void *m=mark_heap(TMP_SPACE); 1220 1220 1221 time_marker *prof1 ;1221 time_marker *prof1=NULL; 1222 1222 if (profiling()) 1223 1223 prof1=new time_marker; … … 1578 1578 current_object=(game_object *)this; 1579 1579 1580 time_marker *prof1 ;1580 time_marker *prof1=NULL; 1581 1581 if (profiling()) 1582 1582 prof1=new time_marker; … … 1621 1621 void *m=mark_heap(TMP_SPACE); 1622 1622 1623 time_marker *prof1 ;1623 time_marker *prof1=NULL; 1624 1624 if (profiling()) 1625 1625 prof1=new time_marker; -
abuse/trunk/src/sdlport/event.cpp
r2 r4 344 344 case SDLK_QUOTE: 345 345 ev.key = SDLK_QUOTEDBL; break; 346 default: 347 break; 346 348 } 347 349 } -
abuse/trunk/src/sdlport/setup.cpp
r2 r4 40 40 printf( " -size <arg> Set the size of the screen\n" ); 41 41 printf( " -edit Startup in editor mode\n" ); 42 printf( " -a <arg> Use addon named <arg>\n" ); 42 43 printf( " -f <arg> Load map file named <arg>\n" ); 43 44 printf( " -lisp Startup in lisp interpreter mode\n" ); … … 73 74 { 74 75 fputs( "; Abuse-SDL Configuration file\n\n", fd ); 75 fputs( "; Location of the datafiles\ndatadir=/ usr/local/share/games/abuse\n\n", fd );76 fputs( "; Location of the datafiles\ndatadir=/var/games/abuse\n\n", fd ); 76 77 fputs( "; Startup fullscreen\nfullscreen=0\n\n", fd ); 77 78 fputs( "; Use DoubleBuffering\ndoublebuf=0\n\n", fd ); … … 106 107 107 108 rcfile = (char *)jmalloc( strlen( get_save_filename_prefix() ) + 9, "rcfile" ); 108 sprintf( rcfile, "%s/abuserc \0", get_save_filename_prefix() );109 sprintf( rcfile, "%s/abuserc", get_save_filename_prefix() ); 109 110 if( (fd = fopen( rcfile, "r" )) != NULL ) 110 111 { … … 360 361 { 361 362 savedir = (char *)jmalloc( strlen( homedir ) + 8, "savedir" ); 362 sprintf( savedir, "%s/.abuse/ \0", homedir );363 sprintf( savedir, "%s/.abuse/", homedir ); 363 364 // Check if we already have a savegame directory 364 365 if( (fd = fopen( savedir, "r" )) == NULL ) -
abuse/trunk/src/sdlport/sound.cpp
r2 r4 67 67 if( handle->length > 0 && handle->pos ) 68 68 { 69 len = ( len > handle->length ? handle->length : len );69 len = ( len > (int)handle->length ? handle->length : len ); 70 70 SDL_MixAudio( stream, handle->pos, len, handle->volume ); 71 71 handle->pos += len; … … 113 113 datadir = get_filename_prefix(); 114 114 sfxdir = (char *)jmalloc( strlen( datadir ) + 6, "sfxdir" ); 115 sprintf( sfxdir, "%s/sfx/ \0", datadir );115 sprintf( sfxdir, "%s/sfx/", datadir ); 116 116 if( (fd = fopen( sfxdir,"r" )) == NULL ) 117 117 { -
abuse/trunk/src/sdlport/video.cpp
r2 r4 226 226 void put_part_image( image *im, int x, int y, int x1, int y1, int x2, int y2 ) 227 227 { 228 int x s, xe, ys, ye;228 int xe, ye; 229 229 SDL_Rect srcrect, dstrect; 230 230 int ii, jj; … … 232 232 Uint8 *dpixel; 233 233 Uint16 dinset; 234 int dest_addr, line_width;235 234 236 235 if( (unsigned)y > yres || (unsigned)x > xres ) -
abuse/trunk/src/unixnfc.cpp
r2 r4 416 416 spec_directory sd(fp); 417 417 418 #if 0 418 419 spec_entry *e=sd.find("Copyright 1995 Crack dot Com, All Rights reserved"); 419 420 if (!e) … … 424 425 } 425 426 else 427 #endif 426 428 current_level=new level(&sd,fp,NET_STARTFILE); 427 429
Note: See TracChangeset
for help on using the changeset viewer.
