From fc4c96abcd57d8348090ad3f013c4acf0c46917d Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 17 Dec 2002 08:24:11 +0000 Subject: [PATCH] portability fixes --- stepmania/src/RageUtil.cpp | 2 +- stepmania/src/RageUtil.h | 12 ++---------- stepmania/src/archutils/Win32/arch_setup.h | 3 ++- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index 2d87ee2873..108ed00121 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -245,7 +245,7 @@ bool CreateDirectories( CString Path ) for(unsigned i = 0; i < parts.size(); ++i) { curpath += parts[i] + "/"; - if(mkdir( curpath )) + if(mkdir( curpath, 0755 )) continue; if(errno != EEXIST) diff --git a/stepmania/src/RageUtil.h b/stepmania/src/RageUtil.h index b824c76009..9cfae1d33f 100644 --- a/stepmania/src/RageUtil.h +++ b/stepmania/src/RageUtil.h @@ -170,6 +170,7 @@ unsigned int GetHashForString( CString s ); unsigned int GetHashForFile( CString sPath ); unsigned int GetHashForDirectory( CString sDir ); // a hash value that remains the same as long as nothing in the directory has changed +bool DoStat(CString sPath, struct stat *st); bool DoesFileExist( const CString &sPath ); bool IsAFile( const CString &sPath ); bool IsADirectory( const CString &sPath ); @@ -186,16 +187,7 @@ float calc_stddev(const float *start, const float *end); void TrimLeft(CString &str, const char *s = "\r\n\t "); void TrimRight(CString &str, const char *s = "\r\n\t "); -/* Fix Windows breakage ... */ -#ifdef WIN32 -#include /* has stuff that should be in unistd.h */ -#define getcwd _getcwd -#define wgetcwd _wgetcwd -#define chdir _chdir -#define wchdir _wchdir -#define alloca _alloca -#define stat _stat -#else +#ifndef WIN32 #include /* correct place with correct definitions */ #endif diff --git a/stepmania/src/archutils/Win32/arch_setup.h b/stepmania/src/archutils/Win32/arch_setup.h index 49753e1d31..d80ab4e7de 100644 --- a/stepmania/src/archutils/Win32/arch_setup.h +++ b/stepmania/src/archutils/Win32/arch_setup.h @@ -12,9 +12,10 @@ #define chdir _chdir #define wchdir _wchdir #define alloca _alloca - #define stat _stat #define lstat _stat +/* mkdir is missing the mode arg */ +#define mkdir(p,m) mkdir(p) #endif