From 14737bd64c6b7f0a02c4f26055d5f9a93c6cac53 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 23 Jul 2005 19:17:11 +0000 Subject: Use ANSI-standard limit constants. Remove LINUX define. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 19 --- src/m_misc.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'src/m_misc.c') diff --git a/src/m_misc.c b/src/m_misc.c index 511086e7..36bb461c 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: m_misc.c 8 2005-07-23 16:44:57Z fraggle $ +// $Id: m_misc.c 19 2005-07-23 19:17:11Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -23,6 +23,9 @@ // // // $Log$ +// Revision 1.3 2005/07/23 19:17:11 fraggle +// Use ANSI-standard limit constants. Remove LINUX define. +// // Revision 1.2 2005/07/23 16:44:55 fraggle // Update copyright to GNU GPL // @@ -38,7 +41,7 @@ //----------------------------------------------------------------------------- static const char -rcsid[] = "$Id: m_misc.c 8 2005-07-23 16:44:57Z fraggle $"; +rcsid[] = "$Id: m_misc.c 19 2005-07-23 19:17:11Z fraggle $"; #include #include @@ -226,11 +229,6 @@ extern char* sndserver_filename; extern int mb_used; #endif -#ifdef LINUX -char* mousetype; -char* mousedev; -#endif - extern char* chat_macros[]; @@ -252,7 +250,6 @@ default_t defaults[] = {"show_messages",&showMessages, 1}, -#ifdef NORMALUNIX {"key_right",&key_right, KEY_RIGHTARROW}, {"key_left",&key_left, KEY_LEFTARROW}, {"key_up",&key_up, KEY_UPARROW}, @@ -265,19 +262,6 @@ default_t defaults[] = {"key_strafe",&key_strafe, KEY_RALT}, {"key_speed",&key_speed, KEY_RSHIFT}, -// UNIX hack, to be removed. -#ifdef SNDSERV - {"sndserver", (int *) &sndserver_filename, (int) "sndserver"}, - {"mb_used", &mb_used, 2}, -#endif - -#endif - -#ifdef LINUX - {"mousedev", (int*)&mousedev, (int)"/dev/ttyS0"}, - {"mousetype", (int*)&mousetype, (int)"microsoft"}, -#endif - {"use_mouse",&usemouse, 1}, {"mouseb_fire",&mousebfire,0}, {"mouseb_strafe",&mousebstrafe,1}, -- cgit v1.2.3