From 6d72f0d47f4714688dd65776b6ef9801c5a7cceb Mon Sep 17 00:00:00 2001
From: Martin Schaffner <schaffnerb@gmx.ch>
Date: Sun, 23 Jan 2005 14:46:49 +0000
Subject: [PATCH] make sure nocfile.h and cfile.h are never both included

---
 ChangeLog           | 7 ++++++-
 include/nocfile.h   | 6 +++---
 main/editor/kmine.c | 8 ++++----
 main/editor/mine.c  | 6 +++---
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bdacf4fd..1ae8b093 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,12 @@
 	only on last level of built-in mission.
 	* main/gauges.c: fix bug #2110: redraw energy/afterburner gauges
 	whenever necessary
-	* change cfopen to use buffers (speeding it up), and use cfopen instead of PHYSFS_openRead/PHYSFS_openWrite where appropriate
+	* arch/ogl/gr.c, include/cfile.h, main/config.c, main/newdemo.c,
+	main/playsave.c, main/state.c, misc/args.c: change cfopen to use
+	buffers (speeding it up), and use cfopen instead of
+	PHYSFS_openRead/PHYSFS_openWrite where appropriate
+	* include/nocfile.h, main/editor/kmine.c, main/editor/mine.c: make
+	sure nocfile.h and cfile.h are never both included
 
 2005-01-10  Chris Taylor  <c.taylor@student.curtin.edu.au>
 
diff --git a/include/nocfile.h b/include/nocfile.h
index 3a537b58..da4f0de2 100644
--- a/include/nocfile.h
+++ b/include/nocfile.h
@@ -13,11 +13,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 
 
-#ifndef _NOCFILE_H
-#define _NOCFILE_H
+#ifndef _CFILE_H
+#define _CFILE_H
 
 #include <stdio.h>
-#include <io.h>
+//#include <io.h>
 
 #define CFILE FILE
 
diff --git a/main/editor/kmine.c b/main/editor/kmine.c
index 5963fe37..bf14cbff 100644
--- a/main/editor/kmine.c
+++ b/main/editor/kmine.c
@@ -1,4 +1,4 @@
-/* $Id: kmine.c,v 1.4 2004-12-21 11:58:14 btb Exp $ */
+/* $Id: kmine.c,v 1.5 2005-01-23 14:46:49 schaffner 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.4 2004-12-21 11:58:14 btb Exp $";
+static char rcsid[] = "$Id: kmine.c,v 1.5 2005-01-23 14:46:49 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -33,6 +33,8 @@ static char rcsid[] = "$Id: kmine.c,v 1.4 2004-12-21 11:58:14 btb Exp $";
 #include "error.h"
 #include "strutil.h"
 
+#include "nocfile.h"
+
 #include "inferno.h"
 #include "editor.h"
 #include "ui.h"
@@ -44,8 +46,6 @@ static char rcsid[] = "$Id: kmine.c,v 1.4 2004-12-21 11:58:14 btb Exp $";
 #include "game.h"
 #include "gameseq.h"
 
-#include "nocfile.h"
-
 #include "object.h"
 
 #define MINESAVE_CRIPPLED	0
diff --git a/main/editor/mine.c b/main/editor/mine.c
index 4f26a898..88a8a105 100644
--- a/main/editor/mine.c
+++ b/main/editor/mine.c
@@ -1,4 +1,4 @@
-/* $Id: mine.c,v 1.5 2004-12-24 05:17:09 btb Exp $ */
+/* $Id: mine.c,v 1.6 2005-01-23 14:46:49 schaffner 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.5 2004-12-24 05:17:09 btb Exp $";
+static char rcsid[] = "$Id: mine.c,v 1.6 2005-01-23 14:46:49 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -31,6 +31,7 @@ static char rcsid[] = "$Id: mine.c,v 1.5 2004-12-24 05:17:09 btb Exp $";
 #include <math.h>
 #include <string.h>
 
+#include "nocfile.h"
 #include "mono.h"
 #include "key.h"
 #include "gr.h"
@@ -53,7 +54,6 @@ static char rcsid[] = "$Id: mine.c,v 1.5 2004-12-24 05:17:09 btb Exp $";
 #include "medwall.h"
 #include "switch.h"
 
-#include "nocfile.h"
 #include "fuelcen.h"
 
 #define REMOVE_EXT(s)  (*(strchr( (s), '.' ))='\0')
-- 
2.39.2