gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 00:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixup some conditional compilation to use __MINGW32__

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22535 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-02-22 09:30:55 +00:00
parent 276ca33bac
commit a5a27ea328
6 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/NSPathUtilities.m
View file

@ -117,7 +117,7 @@ static NSString *gnustep_flattened =
nil;
#endif
#if defined(__WIN32__)
#if defined(__MINGW32__)
/*
* FIXME ... should check access properly if the file is on an NTFS volume.
*/
@ -663,7 +663,7 @@ ParseConfigurationFile(NSString *fileName, NSMutableDictionary *dict,
if ([userName isEqual: fileOwner] == NO)
{
#if defined(__WIN32__)
#if defined(__MINGW32__)
fprintf(stderr, "The file '%S' is owned by '%s' but we expect it"
" to be the personal config file of '%s'.\nIgnoring it.\n",
[fileName fileSystemRepresentation],
@ -679,7 +679,7 @@ ParseConfigurationFile(NSString *fileName, NSMutableDictionary *dict,
}
if (([attributes filePosixPermissions] & (0022 & ATTRMASK)) != 0)
{
#if defined(__WIN32__)
#if defined(__MINGW32__)
fprintf(stderr, "The file '%S' is writable by someone other than"
" its owner (permissions 0%lo).\nIgnoring it.\n",
[fileName fileSystemRepresentation],
@ -968,7 +968,7 @@ GSSetUserName(NSString *aName)
NSString *
NSUserName(void)
{
#if defined(__WIN32__)
#if defined(__MINGW32__)
if (theUserName == nil)
{
/* Use the LOGNAME environment variable if set. */
@ -1108,7 +1108,7 @@ NSHomeDirectoryForUser(NSString *loginName)
NSString *
NSFullUserName(void)
{
#if defined(__WIN32__)
#if defined(__MINGW32__)
/* FIXME: Win32 way to get full user name via Net API */
return NSUserName();
#else
@ -1210,7 +1210,7 @@ NSTemporaryDirectory(void)
int perm;
int owner;
BOOL flag;
#if !defined(__WIN32__)
#if !defined(__MINGW32__)
int uid;
#else
unichar buffer[1024];
@ -1237,12 +1237,10 @@ NSTemporaryDirectory(void)
baseTempDirName = [env objectForKey: @"TMP"];
if (baseTempDirName == nil)
{
#if defined(__MINGW32__)
#ifdef __CYGWIN__
#if defined(__CYGWIN__)
baseTempDirName = @"/cygdrive/c/";
#else
baseTempDirName = @"/c/";
#endif
#elif defined(__MINGW32__)
baseTempDirName = @"C:\\";
#else
baseTempDirName = @"/tmp";
#endif