From 2d1210906e32abd09729a760d688081c10bb2f48 Mon Sep 17 00:00:00 2001
From: Martin Schaffner <schaffnerb@gmx.ch>
Date: Tue, 25 Jan 2005 21:20:29 +0000
Subject: [PATCH] clean up path/file length macros

---
 ChangeLog         |  1 +
 include/pstypes.h | 20 +++++++++-----------
 main/newmenu.c    |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b03a3cbc..de890a7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@
 	* main/editor/autosave.c, main/editor/editor.h, main/editor/group.c,
 	main/editor/kgame.c, main/editor/kmine.c, main/editor/macro.c,
 	main/gamesave.c: s/128/PATH_MAX
+	* include/pstypes.h, main/newmenu.c: clean up path/file length macros
 
 2005-01-24  Chris Taylor  <c.taylor@student.curtin.edu.au>
 
diff --git a/include/pstypes.h b/include/pstypes.h
index c248ae2f..3fdab9d8 100644
--- a/include/pstypes.h
+++ b/include/pstypes.h
@@ -1,4 +1,4 @@
-/* $Id: pstypes.h,v 1.32 2004-08-28 23:17:45 schaffner Exp $ */
+/* $Id: pstypes.h,v 1.33 2005-01-25 21:20:29 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -70,21 +70,19 @@ typedef unsigned int uint;
 # ifndef __MINGW32__
 #  define PATH_MAX _MAX_PATH
 # endif
-# ifdef _WIN32_WCE
-#  define _MAX_DIR 256
-# endif
+# define FNAME_MAX 256
 #elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 # include <sys/types.h>
-# define _MAX_PATH 1024
-# define _MAX_DIR 256
+# ifndef PATH_MAX
+#  define PATH_MAX 1024
+# endif
+# define FNAME_MAX 256
 #elif defined __DJGPP__
 # include <sys/types.h>
-# define _MAX_PATH 255
-# define _MAX_DIR 63
+# define FNAME_MAX 9	// excluding extension
 #elif defined(macintosh)
-# define _MAX_PATH 255
-# define _MAX_DIR 63
-# define PATH_MAX _MAX_PATH
+# define PATH_MAX 256
+# define FNAME_MAX 32
 #endif
 
 #ifndef __cplusplus
diff --git a/main/newmenu.c b/main/newmenu.c
index 2856cd71..12d42cf0 100644
--- a/main/newmenu.c
+++ b/main/newmenu.c
@@ -1,4 +1,4 @@
-/* $Id: newmenu.c,v 1.29 2004-12-01 12:48:13 btb Exp $ */
+/* $Id: newmenu.c,v 1.30 2005-01-25 21:20:29 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -2353,7 +2353,7 @@ RePaintNewmenuFile:
  				if (x==0)	{
 					char * p;
 					int ret;
-					char name[_MAX_PATH];
+					char name[PATH_MAX];
 
 					p = &filenames[(citem*14)+strlen(&filenames[citem*14])];
 					if (player_mode)
-- 
2.39.2