From 2101863e017cb49e7da382f19cb9bddddda3d14a Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Sun, 16 Feb 2014 09:59:22 -0500 Subject: [PATCH] move DIR_SEPERATOR_* defines to pstypes.h --- include/cfile.h | 8 -------- include/pstypes.h | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/cfile.h b/include/cfile.h index cc9a828..f53e75b 100644 --- a/include/cfile.h +++ b/include/cfile.h @@ -342,14 +342,6 @@ #include #include "pstypes.h" -// same thing that's in FS2_Open (credit: Mike Harris) -#ifdef PLAT_UNIX -#define DIR_SEPARATOR_CHAR '/' -#define DIR_SEPARATOR_STR "/" -#else -#define DIR_SEPARATOR_CHAR '\\' -#define DIR_SEPARATOR_STR "\\" -#endif #define CF_EOF (-1) diff --git a/include/pstypes.h b/include/pstypes.h index 7544ea0..a642f4a 100644 --- a/include/pstypes.h +++ b/include/pstypes.h @@ -269,6 +269,15 @@ #include "unix.h" #endif +// same thing that's in FS2_Open (credit: Mike Harris) +#ifdef PLAT_UNIX +#define DIR_SEPARATOR_CHAR '/' +#define DIR_SEPARATOR_STR "/" +#else +#define DIR_SEPARATOR_CHAR '\\' +#define DIR_SEPARATOR_STR "\\" +#endif + // value to represent an uninitialized state in any int or uint #define UNINITIALIZED 0x7f8e6d9c -- 2.39.2