From 885ec3adc15cfa055d9bacc8077697b06ae79c56 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Mon, 22 Jul 2002 22:59:24 +0000 Subject: [PATCH] use __unix__ --- arch/include/joy.h | 18 +++--------------- arch/ogl/gr.c | 2 +- include/loadgl.h | 8 ++------ include/pstypes.h | 3 ++- include/strutil.h | 3 ++- include/vecmat.h | 18 +++--------------- main/inferno.c | 4 ++-- main/kconfig.c | 13 +++++++------ 8 files changed, 22 insertions(+), 47 deletions(-) diff --git a/arch/include/joy.h b/arch/include/joy.h index 52ff12a9..f146efa8 100644 --- a/arch/include/joy.h +++ b/arch/include/joy.h @@ -1,3 +1,4 @@ +/* $ Id: $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -12,22 +13,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* - * $Source: /cvs/cvsroot/d2x/arch/include/joy.h,v $ - * $Revision: 1.4 $ - * $Author: bradleyb $ - * $Date: 2001-10-18 23:59:22 $ * * Header for joystick functions * - * $Log: not supported by cvs2svn $ - * Revision 1.3 2001/10/12 00:18:37 bradleyb - * Switched from Cygwin to mingw32 on MS boxes. Vastly improved compilability. - * - * Revision 1.2 2001/01/29 13:36:14 bradleyb - * Removed duplicate files - * - * Revision 1.1 2001/01/28 16:10:57 bradleyb - * unified input headers. * */ @@ -52,7 +40,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #if defined WINDOWS #define JOY_NUM_AXES 7 -#elif defined __linux__ +#elif defined __unix__ #define JOY_NUM_AXES 5 #else #define JOY_NUM_AXES 4 @@ -74,7 +62,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. /* not present in d2src, maybe we don't really need it? */ #define JOY_FRIENDLY_READINGS 8 -#ifdef __linux__ +#ifdef __unix__ #define MAX_BUTTONS 64 #else #define MAX_BUTTONS 20 diff --git a/arch/ogl/gr.c b/arch/ogl/gr.c index e6d4f550..b8dcb190 100644 --- a/arch/ogl/gr.c +++ b/arch/ogl/gr.c @@ -311,7 +311,7 @@ int ogl_testneedmipmaps(int i){ #if defined(__WINDOWS__) || defined(__MINGW32__) char *OglLibPath="opengl32.dll"; #endif -#ifdef __linux__ +#ifdef __unix__ char *OglLibPath="libGL.so"; #endif diff --git a/include/loadgl.h b/include/loadgl.h index c725743e..a4a3f18f 100644 --- a/include/loadgl.h +++ b/include/loadgl.h @@ -1,12 +1,8 @@ +/* $ Id: $ */ /* - * $Source: /cvs/cvsroot/d2x/include/loadgl.h,v $ - * $Revision: 1.4 $ - * $Author: bradleyb $ - * $Date: 2001-10-31 07:41:54 $ * * dynamic opengl loading - curtousy (sp) of Jeff Slutter * - * $Log: not supported by cvs2svn $ * */ @@ -1181,7 +1177,7 @@ void *dll_GetSymbol(void *dllhandle,const char *symname) return (void *)GetProcAddress((HINSTANCE)dllhandle,symname); } #endif -#ifdef __linux__ +#ifdef __unix__ #include void *dll_LoadModule(const char *name) { diff --git a/include/pstypes.h b/include/pstypes.h index 75267cd6..3140783f 100644 --- a/include/pstypes.h +++ b/include/pstypes.h @@ -1,3 +1,4 @@ +/* $ Id: $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -22,7 +23,7 @@ typedef signed char byte; //define unsigned types; typedef unsigned char ubyte; -#ifndef __linux__ +#ifndef __unix__ typedef unsigned short ushort; typedef unsigned int uint; typedef unsigned long ulong; diff --git a/include/strutil.h b/include/strutil.h index 6047dfc1..93c0a78b 100644 --- a/include/strutil.h +++ b/include/strutil.h @@ -1,3 +1,4 @@ +/* $ Id: $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -16,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. char *d_strdup(char *str); -#ifdef __linux__ +#ifdef __unix__ #define stricmp(a,b) strcasecmp(a,b) #define strnicmp(a,b,c) strncasecmp(a,b,c) #elif 0 diff --git a/include/vecmat.h b/include/vecmat.h index 09b30f82..a0d5aab5 100644 --- a/include/vecmat.h +++ b/include/vecmat.h @@ -1,4 +1,4 @@ - +/* $ Id: $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -12,22 +12,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* - * $Source: /cvs/cvsroot/d2x/include/vecmat.h,v $ - * $Revision: 1.3 $ - * $Author: bradleyb $ - * $Date: 2001-10-18 23:59:22 $ * * Header file for vector/matrix library * - * $Log: not supported by cvs2svn $ - * Revision 1.2 2001/10/12 06:40:49 bradleyb - * fix some gcc 3.0 warnings, courtesy of paoloulivi@tin.it - * - * Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb - * Import of d2x-0.0.8 - * - * Revision 1.1.1.1 1999/06/14 22:02:28 donut - * Import of d1x 1.37 source. + * Old Log: * * Revision 1.1 1995/04/17 16:18:05 allender * Initial revision @@ -233,7 +221,7 @@ __pack__ vms_matrix; // DPH (18/9/98): Begin mod to fix linefeed problem under linux. Uses an // inline function instead of a multi-line macro to fix CR/LF problems. -#ifdef __linux__ +#ifdef __unix__ static inline void vm_set_identity(vms_matrix *m) { m->rvec.x = m->uvec.y = m->fvec.z = f1_0; diff --git a/main/inferno.c b/main/inferno.c index 7ea9462a..ca566634 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -1,4 +1,4 @@ -/* $Id: inferno.c,v 1.32 2002-07-22 02:20:05 btb Exp $ */ +/* $Id: inferno.c,v 1.33 2002-07-22 22:59:24 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -345,7 +345,7 @@ void print_commandline_help() printf( " -nosdlvidmodecheck %s\n", "Some X servers don't like checking vidmode first, so just switch"); printf( " -hwsurface %s\n","FIXME: Undocumented"); #endif -#ifdef __linux__ +#ifdef __unix__ printf( " -serialdevice %s\n", "Set serial/modem device to "); printf( " -serialread %s\n", "Set serial/modem to read from "); #endif diff --git a/main/kconfig.c b/main/kconfig.c index ac3ab2cb..82ba5f8f 100644 --- a/main/kconfig.c +++ b/main/kconfig.c @@ -1,3 +1,4 @@ +/* $ Id: $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -16,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: kconfig.c,v 1.12 2002-03-23 09:13:00 bradleyb Exp $"; +static char rcsid[] = "$Id: kconfig.c,v 1.13 2002-07-22 22:59:24 btb Exp $"; #endif #ifdef WINDOWS @@ -71,7 +72,7 @@ static char rcsid[] = "$Id: kconfig.c,v 1.12 2002-03-23 09:13:00 bradleyb Exp $" #include "d_delay.h" #include "collide.h" -#ifdef __linux__ +#ifdef __unix__ #include "joystick.h" #endif @@ -1529,7 +1530,7 @@ WIN(DDGRUNLOCK(dd_grd_curcanv)); void kc_change_joyaxis( kc_item * item ) { -#ifdef __linux__ +#ifdef __unix__ int axis[MAX_AXES]; int old_axis[MAX_AXES]; #else @@ -2693,7 +2694,7 @@ void controls_read_all() int idx, idy; fix ctime; fix mouse_axis[3] = {0,0,0}; -#ifdef __linux__ +#ifdef __unix__ int raw_joy_axis[MAX_AXES]; #else int raw_joy_axis[JOY_NUM_AXES]; @@ -2734,7 +2735,7 @@ void controls_read_all() channel_masks = joystick_read_raw_axis( JOY_ALL_AXIS, raw_joy_axis ); for (i=0; i<6; i++ ) { -#ifndef __linux__ +#ifndef __unix__ if (channel_masks&(1<