summaryrefslogtreecommitdiff
path: root/src/util/File.c
diff options
context:
space:
mode:
authorgoodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac>2000-05-08 10:26:36 +0000
committergoodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac>2000-05-08 10:26:36 +0000
commit7e977e1b51403223cf1924a3b07d7429f9d509c0 (patch)
tree5d8446e169813aa1677684dbdf25f18b1de2f764 /src/util/File.c
parent2f6e0bd3c4448252265dbb1040051c332dd926a0 (diff)
Changing macro name to keep solaris compiler happy.
Tom git-svn-id: http://svn.cactuscode.org/flesh/trunk@1630 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/util/File.c')
-rw-r--r--src/util/File.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/util/File.c b/src/util/File.c
index 5396a47a..2c75ae8a 100644
--- a/src/util/File.c
+++ b/src/util/File.c
@@ -30,14 +30,13 @@ CCTK_FILEVERSION(util_File_c)
/* Some systems don't have mode_t and only pass one argument to mkdir. */
#ifdef HAVE_MODE_T
-#define mkdir(a,b) mkdir(a,b)
+#define MKDIR_WRAPPER(a,b) mkdir(a,b)
#else
/* FIXME: Temporary kludge until everyone has reconfigured */
#ifdef WIN32
-#define mkdir(a,b) mkdir(a)
+#define MKDIR_WRAPPER(a,b) mkdir(a)
#else
-#define mkdir(a,b) mkdir(a,b)
/* Should just be the clause with one argument, this one should go. */
#endif /* WIN32 */
@@ -178,7 +177,7 @@ int CCTK_MkDirs(const char *pathname, int mode)
if(stat(current, &statbuf))
{
CCTK_VInfo("Cactus","Creating directory: \"%s\"", current);
- if(mkdir(current, mode) == -1)
+ if(MKDIR_WRAPPER(current, mode) == -1)
{
CCTK_VWarn(0,__LINE__,__FILE__,"Cactus","Failed to create directory \"%s\"", current);
retval = -2;
@@ -207,7 +206,7 @@ int CCTK_MkDirs(const char *pathname, int mode)
if(stat(pathname, &statbuf))
{
CCTK_VInfo("Cactus","Creating directory: \"%s\"", pathname);
- if(mkdir(pathname, mode) == -1)
+ if(MKDIR_WRAPPER(pathname, mode) == -1)
{
CCTK_VWarn(0,__LINE__,__FILE__,"Cactus","Failed to create directory \"%s\"", pathname);
retval = -2;