From d1a8285f818eb7e5c3d6a05709ea21a808490b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Mon, 19 Mar 2018 19:55:58 +0100
Subject: New upstream version 5.1.0

---
 app/bin/fileio.h | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'app/bin/fileio.h')

diff --git a/app/bin/fileio.h b/app/bin/fileio.h
index f574126..4f5aa8d 100644
--- a/app/bin/fileio.h
+++ b/app/bin/fileio.h
@@ -1,5 +1,4 @@
-/*
- * $Header: /home/dmarkle/xtrkcad-fork-cvs/xtrkcad/app/bin/fileio.h,v 1.4 2008-01-15 11:46:03 mni77 Exp $
+/** \file fileio.h
  */
 
 /*  XTrkCad - Model Railroad CAD
@@ -23,8 +22,13 @@
 #ifndef FILEIO_H
 #define FILEIO_H
 
+#include <stdio.h>
+
+#include "common.h"
+#include "misc.h"
+
 FILE * paramFile;
-char paramFileName[STR_LONG_SIZE];
+extern char *paramFileName;
 wIndex_t paramLineNum;
 char paramLine[STR_LONG_SIZE];
 char * curContents;
@@ -37,10 +41,6 @@ typedef BOOL_T (*readParam_t) ( char * );
 extern const char * workingDir;
 extern const char * libDir;
 
-extern char curPathName[STR_LONG_SIZE];
-extern char * curFileName;
-extern char curDirName[STR_LONG_SIZE];
-
 #define PARAM_CUSTOM	(-2)
 #define PARAM_LAYOUT	(-3)
 extern int curParamFileIndex;
@@ -57,6 +57,8 @@ int curDemo;
 
 wMenuList_p fileList_ml;
 
+#define PARAM_SUBDIR "params"
+
 #define LAYOUTPATHKEY "layout"
 #define BITMAPPATHKEY "bitmap"
 #define DXFPATHKEY "dxf"
@@ -65,8 +67,7 @@ wMenuList_p fileList_ml;
 #define PARAMETERPATHKEY "params"
 #define IMPORTPATHKEY "import"
 #define MACROPATHKEY "macro"
-
-void SetCurrentPath( const char *, const char * );
+#define CUSTOMPATHKEY "custom"
 
 void Stripcr( char * );
 char * GetNextLine( void );
-- 
cgit v1.2.3