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

Tidied win32 stuff

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@4237 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 1999-05-11 09:21:38 +00:00
parent 7adcc6d423
commit 76595f8207
16 changed files with 104 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/NSUser.m
View file

@ -35,7 +35,7 @@
#include <Foundation/NSUserDefaults.h>
#include <stdlib.h> // for getenv()
#if !defined(__WIN32__) && !defined(_WIN32)
#if !defined(__WIN32__)
#include <unistd.h> // for getlogin()
#endif
#if HAVE_PWD_H
@ -68,7 +68,7 @@ NSUserName ()
if (theUserName == nil)
{
const char *login_name = 0;
#if defined(__WIN32__) || defined(_WIN32)
#if defined(__WIN32__)
/* The GetUserName function returns the current user name */
char buf[1024];
DWORD n = 1024;
@ -112,7 +112,7 @@ NSHomeDirectory ()
NSString *
NSHomeDirectoryForUser (NSString *login_name)
{
#if !defined(__WIN32__) && !defined(_WIN32)
#if !defined(__WIN32__)
struct passwd *pw;
pw = getpwnam ([login_name cString]);
return [NSString stringWithCString: pw->pw_dir];
@ -172,7 +172,7 @@ NSString *NSTemporaryDirectory(void)
{
NSFileManager *manager;
NSString *tempDirName, *baseTempDirName;
#ifdef WIN32
#if defined(__WIN32__)
char buffer[1024];
if (GetTempPath(1024, buffer))
baseTempDirName = [NSString stringWithCString: buffer];
@ -202,7 +202,7 @@ NSString *NSOpenStepRootDirectory(void)
objectForKey:@"GNUSTEP_SYSTEM_ROOT"];
if (!root)
#ifdef WIN32
#if defined(__WIN32__)
root = @"C:\\";
#else
root = @"/";