git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21994 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2005-11-13 07:45:52 +00:00
parent f5484c70a0
commit b02a246b1b
2 changed files with 10 additions and 17 deletions

View file

@ -1,3 +1,9 @@
2005-11-12 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPathUtilities.m: NSOpenStepRootDirectory() mark as
deprecated using macro (was already documented as deprecated).
Get rid of environment variable. Use native path for mingw32
2005-11-11 Richard Frith-Macdonald <rfm@gnu.org>
* Applied Willem Rein Oudshoorn's fix for bug #11055, having tested it

View file

@ -120,15 +120,6 @@ static NSString *gnustep_flattened =
#define MGR() [NSFileManager defaultManager]
/*
* NB. use fprintf() rather than NSLog() to avoid possibility of recursion
* when features of NSLog() cause patrh utilities to be used.
*/
#define PrintOnce(format, args...) \
do { static BOOL beenHere = NO; if (beenHere == NO) {\
beenHere = YES; \
fprintf(stderr, format, ## args); }} while (0)
/* ------------------ */
/* Internal variables */
/* ------------------ */
@ -1263,20 +1254,16 @@ NSOpenStepRootDirectory(void)
{
NSString *root;
root = [[[NSProcessInfo processInfo] environment]
objectForKey: @"GNUSTEP_ROOT"];
if (root == nil)
{
GSOnceMLog(@"deprecated ... use NSSearchPathForDirectoriesInDomains()");
#if defined(__MINGW32__)
#ifdef __CYGWIN__
root = @"/cygdrive/c/";
root = @"/cygdrive/c/";
#else
root = @"~c/";
root = @"C:\\";
#endif
#else
root = @"/";
root = @"/";
#endif
}
return root;
}