gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-01 09:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor win32 fix

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@8468 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 2001-01-03 15:40:22 +00:00
parent 978d1a617b
commit c72589cba7
3 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2001-01-03 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSBundle.m: fix for checking windows executable file
extensions - reported by michael.scheibler@onevision.de
2001-01-03 Mirko Viviani <mirko.viviani@rccr.cremona.it> 2001-01-03 Mirko Viviani <mirko.viviani@rccr.cremona.it>
* Source/NSObjCRuntime.m (GSInstanceVariableInfo): fixes. * Source/NSObjCRuntime.m (GSInstanceVariableInfo): fixes.

6
Headers/gnustep/base/NSObjCRuntime.h
View file

@ -59,13 +59,13 @@ GS_EXPORT void NSLogv (NSString* format, va_list args);
#ifndef YES #ifndef YES
#define YES 1 #define YES 1
#endif YES #endif
#ifndef NO #ifndef NO
#define NO 0 #define NO 0
#endif NO #endif
#ifndef nil #ifndef nil
#define nil 0 #define nil 0
#endif nil #endif
#define FOUNDATION_EXPORT #define FOUNDATION_EXPORT
#define FOUNDATION_STATIC_INLINE static inline #define FOUNDATION_STATIC_INLINE static inline

30
Source/NSBundle.m
View file

@ -1331,19 +1331,23 @@ _bundle_load_callback(Class theClass, Category *theCategory)
if ([mgr isExecutableFileAtPath: prefix]) if ([mgr isExecutableFileAtPath: prefix])
return [prefix stringByStandardizingPath]; return [prefix stringByStandardizingPath];
#if defined(__WIN32__) #if defined(__WIN32__)
/* Also add common executable extensions on windows */ {
if ([path pathExtension] == nil) NSString *ext = [path pathExtension];
{
NSString *wpath; /* Also add common executable extensions on windows */
wpath = [prefix stringByAppendingPathExtension: @"exe"]; if (ext == nil || [ext length] == 0)
if ([mgr isExecutableFileAtPath: wpath]) {
return [wpath stringByStandardizingPath]; NSString *wpath;
wpath = [prefix stringByAppendingPathExtension: @"com"]; wpath = [prefix stringByAppendingPathExtension: @"exe"];
if ([mgr isExecutableFileAtPath: wpath]) if ([mgr isExecutableFileAtPath: wpath])
return [wpath stringByStandardizingPath]; return [wpath stringByStandardizingPath];
wpath = [prefix stringByAppendingPathExtension: @"cmd"]; wpath = [prefix stringByAppendingPathExtension: @"com"];
if ([mgr isExecutableFileAtPath: wpath]) if ([mgr isExecutableFileAtPath: wpath])
return [wpath stringByStandardizingPath]; return [wpath stringByStandardizingPath];
wpath = [prefix stringByAppendingPathExtension: @"cmd"];
if ([mgr isExecutableFileAtPath: wpath])
return [wpath stringByStandardizingPath];
}
} }
#endif #endif
} }