projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed some platform-related preprocessor definition names
[rocksndiamonds.git]
/
src
/
libgame
/
setup.c
diff --git
a/src/libgame/setup.c
b/src/libgame/setup.c
index 8da478a3656126dc45d00570b53e3db3ee3562ea..58e13b6bb87e0929e3d0a9a1a27bebdc37725696 100644
(file)
--- a/
src/libgame/setup.c
+++ b/
src/libgame/setup.c
@@
-516,7
+516,7
@@
char *getProgramMainDataPath(char *command_filename, char *base_path)
set the current working directory to the program package directory) */
char *main_data_path = getBasePath(command_filename);
set the current working directory to the program package directory) */
char *main_data_path = getBasePath(command_filename);
-#if defined(PLATFORM_MAC
OSX
)
+#if defined(PLATFORM_MAC)
if (strSuffix(main_data_path, MAC_APP_BINARY_SUBDIR))
{
char *main_data_path_old = main_data_path;
if (strSuffix(main_data_path, MAC_APP_BINARY_SUBDIR))
{
char *main_data_path_old = main_data_path;
@@
-1785,7
+1785,7
@@
void sortTreeInfo(TreeInfo **node_first)
// some stuff from "files.c"
// ============================================================================
// some stuff from "files.c"
// ============================================================================
-#if defined(PLATFORM_WIN
32
)
+#if defined(PLATFORM_WIN
DOWS
)
#ifndef S_IRGRP
#define S_IRGRP S_IRUSR
#endif
#ifndef S_IRGRP
#define S_IRGRP S_IRUSR
#endif
@@
-1810,7
+1810,7
@@
void sortTreeInfo(TreeInfo **node_first)
#ifndef S_ISGID
#define S_ISGID 0
#endif
#ifndef S_ISGID
#define S_ISGID 0
#endif
-#endif // PLATFORM_WIN
32
+#endif // PLATFORM_WIN
DOWS
// file permissions for newly written files
#define MODE_R_ALL (S_IRUSR | S_IRGRP | S_IROTH)
// file permissions for newly written files
#define MODE_R_ALL (S_IRUSR | S_IRGRP | S_IROTH)
@@
-1834,7
+1834,7
@@
char *getHomeDir(void)
{
static char *dir = NULL;
{
static char *dir = NULL;
-#if defined(PLATFORM_WIN
32
)
+#if defined(PLATFORM_WIN
DOWS
)
if (dir == NULL)
{
dir = checked_malloc(MAX_PATH + 1);
if (dir == NULL)
{
dir = checked_malloc(MAX_PATH + 1);
@@
-1868,7
+1868,7
@@
char *getPersonalDataDir(void)
{
static char *personal_data_dir = NULL;
{
static char *personal_data_dir = NULL;
-#if defined(PLATFORM_MAC
OSX
)
+#if defined(PLATFORM_MAC)
if (personal_data_dir == NULL)
personal_data_dir = getPath2(getHomeDir(), "Documents");
#else
if (personal_data_dir == NULL)
personal_data_dir = getPath2(getHomeDir(), "Documents");
#else
@@
-1922,7
+1922,7
@@
static mode_t posix_umask(mode_t mask)
static int posix_mkdir(const char *pathname, mode_t mode)
{
static int posix_mkdir(const char *pathname, mode_t mode)
{
-#if defined(PLATFORM_WIN
32
)
+#if defined(PLATFORM_WIN
DOWS
)
return mkdir(pathname);
#else
return mkdir(pathname, mode);
return mkdir(pathname);
#else
return mkdir(pathname, mode);