fix occurrences of #ifdef __LINUX__
This commit is contained in:
Bradley Bell
parent
75b07ab1e7
commit
6178f59eee
|
|
@ -7,6 +7,11 @@
|
|||
* main/dumpmine.c, ui/window.c: Specify that two functions return
|
||||
void.
|
||||
|
||||
* main/editor/autosave.c, main/editor/curves.c,
|
||||
main/editor/ehostage.c, main/editor/kmine.c, main/editor/med.c,
|
||||
main/editor/medrobot.c, main/editor/mine.c: fix occurences of
|
||||
#ifdef __LINUX__
|
||||
|
||||
2004-12-19 Chris Taylor <c.taylor@student.curtin.edu.au>
|
||||
|
||||
* main/editor/eobject.c, main/editor/kgame.c,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: autosave.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
|
||||
/* $Id: autosave.c,v 1.4 2004-12-21 11:58:14 btb Exp $ */
|
||||
/*
|
||||
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
||||
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
||||
|
|
@ -20,7 +20,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
*/
|
||||
|
||||
#ifdef RCS
|
||||
static char rcsid[] = "$Id: autosave.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
|
||||
static char rcsid[] = "$Id: autosave.c,v 1.4 2004-12-21 11:58:14 btb Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
|
|
@ -32,7 +32,7 @@ static char rcsid[] = "$Id: autosave.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
|
|||
#include <stdarg.h>
|
||||
#include <math.h>
|
||||
#include <string.h>
|
||||
#ifndef __LINUX__
|
||||
#ifdef __MSDOS__
|
||||
#include <process.h>
|
||||
#endif
|
||||
#include <time.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: curves.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
|
||||
/* $Id: curves.c,v 1.4 2004-12-21 11:58:14 btb Exp $ */
|
||||
/*
|
||||
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
||||
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
||||
|
|
@ -19,7 +19,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
*/
|
||||
|
||||
#ifdef RCS
|
||||
static char rcsid[] = "$Id: curves.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
|
||||
static char rcsid[] = "$Id: curves.c,v 1.4 2004-12-21 11:58:14 btb Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
|
|
@ -32,7 +32,7 @@ static char rcsid[] = "$Id: curves.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
|
|||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <stdarg.h>
|
||||
#ifndef __LINUX__
|
||||
#ifdef __MSDOS__
|
||||
#include <conio.h>
|
||||
#include <dos.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: ehostage.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
|
||||
/* $Id: ehostage.c,v 1.4 2004-12-21 11:58:14 btb Exp $ */
|
||||
/*
|
||||
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
||||
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
||||
|
|
@ -19,7 +19,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
*/
|
||||
|
||||
#ifdef RCS
|
||||
static char rcsid[] = "$Id: ehostage.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
|
||||
static char rcsid[] = "$Id: ehostage.c,v 1.4 2004-12-21 11:58:14 btb Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
|
|
@ -28,7 +28,7 @@ static char rcsid[] = "$Id: ehostage.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
|
|||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#ifndef __LINUX__
|
||||
#ifdef __MSDOS__
|
||||
#include <conio.h>
|
||||
#include <dos.h>
|
||||
#include <direct.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: kmine.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
|
||||
/* $Id: kmine.c,v 1.4 2004-12-21 11:58:14 btb Exp $ */
|
||||
/*
|
||||
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
||||
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
||||
|
|
@ -19,7 +19,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
*/
|
||||
|
||||
#ifdef RCS
|
||||
static char rcsid[] = "$Id: kmine.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
|
||||
static char rcsid[] = "$Id: kmine.c,v 1.4 2004-12-21 11:58:14 btb Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
|
|
@ -31,6 +31,7 @@ static char rcsid[] = "$Id: kmine.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
|
|||
#include <stdlib.h>
|
||||
|
||||
#include "error.h"
|
||||
#include "strutil.h"
|
||||
|
||||
#include "inferno.h"
|
||||
#include "editor.h"
|
||||
|
|
@ -262,9 +263,7 @@ int med_save_situation(char * filename)
|
|||
|
||||
// Write mine name.
|
||||
// strcpy(mine_name, filename);
|
||||
#ifndef __LINUX__
|
||||
_splitpath(filename,NULL,NULL,mine_name,NULL);
|
||||
#endif
|
||||
_splitpath(filename, NULL, NULL, mine_name, NULL);
|
||||
set_extension(mine_name, "min");
|
||||
fprintf(SaveFile, "%s\n", mine_name);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: med.c,v 1.3 2004-12-19 14:52:48 btb Exp $ */
|
||||
/* $Id: med.c,v 1.4 2004-12-21 11:58:14 btb Exp $ */
|
||||
/*
|
||||
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
||||
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
||||
|
|
@ -627,6 +627,8 @@ int DosShell()
|
|||
int ok, w, h;
|
||||
grs_bitmap * save_bitmap;
|
||||
|
||||
ok = 1;
|
||||
|
||||
// Save the current graphics state.
|
||||
|
||||
w = grd_curscreen->sc_canvas.cv_bitmap.bm_w;
|
||||
|
|
@ -641,9 +643,9 @@ int DosShell()
|
|||
fflush(stdout);
|
||||
|
||||
key_close();
|
||||
#ifndef __LINUX__
|
||||
#ifdef __MSDOS__
|
||||
ok = spawnl(P_WAIT,getenv("COMSPEC"), NULL );
|
||||
#else
|
||||
#elif defined(__linux__)
|
||||
system("");
|
||||
#endif
|
||||
key_init();
|
||||
|
|
@ -654,7 +656,7 @@ int DosShell()
|
|||
//gr_pal_setblock( 0, 256, grd_curscreen->pal );
|
||||
//gr_use_palette_table();
|
||||
|
||||
return 1;
|
||||
return ok;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: medrobot.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
|
||||
/* $Id: medrobot.c,v 1.4 2004-12-21 11:58:14 btb Exp $ */
|
||||
/*
|
||||
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
||||
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
||||
|
|
@ -19,7 +19,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
*/
|
||||
|
||||
#ifdef RCS
|
||||
static char rcsid[] = "$Id: medrobot.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
|
||||
static char rcsid[] = "$Id: medrobot.c,v 1.4 2004-12-21 11:58:14 btb Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
|
|
@ -28,7 +28,7 @@ static char rcsid[] = "$Id: medrobot.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
|
|||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#ifndef __LINUX__
|
||||
#ifdef __MSDOS__
|
||||
#include <conio.h>
|
||||
#include <direct.h>
|
||||
#include <dos.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: mine.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
|
||||
/* $Id: mine.c,v 1.4 2004-12-21 11:58:14 btb Exp $ */
|
||||
/*
|
||||
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
||||
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
||||
|
|
@ -19,7 +19,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
*/
|
||||
|
||||
#ifdef RCS
|
||||
static char rcsid[] = "$Id: mine.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
|
||||
static char rcsid[] = "$Id: mine.c,v 1.4 2004-12-21 11:58:14 btb Exp $";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
|
|
@ -79,7 +79,7 @@ int med_save_mine(char * filename)
|
|||
SaveFile = cfopen( filename, CF_WRITE_MODE );
|
||||
if (!SaveFile)
|
||||
{
|
||||
#ifndef __LINUX__
|
||||
#if 0 //ndef __linux__
|
||||
char fname[20];
|
||||
_splitpath( filename, NULL, NULL, fname, NULL );
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue