From 500003732d6c0b40a213e14189a83d1dbc7fc0e9 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Tue, 27 Jun 2000 06:10:21 +0000 Subject: [PATCH] Given the statement "a == b ? c : d;" , the WorkShop 5.0 compiler expects c & d to be of the same type. git-svn-id: svn://10.0.0.236/trunk@73296 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/io/nsLocalFileUnix.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla/xpcom/io/nsLocalFileUnix.cpp b/mozilla/xpcom/io/nsLocalFileUnix.cpp index 93a5c206ba6..eadaaf6d90e 100644 --- a/mozilla/xpcom/io/nsLocalFileUnix.cpp +++ b/mozilla/xpcom/io/nsLocalFileUnix.cpp @@ -366,6 +366,9 @@ nsLocalFile::OpenANSIFileDesc(const char *mode, FILE * *_retval) static int exclusive_create(const char * path, mode_t mode) { return open(path, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode); } +static int exclusive_mkdir(const char * path, mode_t mode) { + return mkdir(path, mode); +} NS_IMETHODIMP nsLocalFile::Create(PRUint32 type, PRUint32 permissions) @@ -381,7 +384,7 @@ nsLocalFile::Create(PRUint32 type, PRUint32 permissions) #else int (*creationFunc)(const char *, mode_t) = #endif - type == NORMAL_FILE_TYPE ? exclusive_create : mkdir; + type == NORMAL_FILE_TYPE ? exclusive_create : exclusive_mkdir; result = creationFunc((const char *)mPath, permissions);