mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 16:30:41 +00:00
Remove non-Openstep classes. More WIN32 changes.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@6669 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
7066b8e47f
commit
90f99a043c
12 changed files with 84 additions and 57 deletions
|
@ -322,6 +322,12 @@ _bundle_load_callback(Class theClass, Category *theCategory)
|
|||
#else
|
||||
patharr = [pathlist componentsSeparatedByString:@":"];
|
||||
#endif
|
||||
/* Add . if not already in path */
|
||||
if ([patharr indexOfObject: @"."] == NSNotFound)
|
||||
{
|
||||
patharr = AUTORELEASE([patharr mutableCopy]);
|
||||
[patharr addObject: @"."];
|
||||
}
|
||||
patharr = [patharr objectEnumerator];
|
||||
while ((prefix = [patharr nextObject]))
|
||||
{
|
||||
|
|
|
@ -25,6 +25,9 @@
|
|||
#include <base/preface.h>
|
||||
#include <Foundation/NSZone.h>
|
||||
#include <string.h>
|
||||
#ifdef __WIN32__
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
#ifndef __MINGW__
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
@ -136,7 +139,11 @@ NSAllocateMemoryPages (unsigned bytes)
|
|||
return NULL;
|
||||
return where;
|
||||
#else
|
||||
#if HAVE_VALLOC
|
||||
where = valloc (bytes);
|
||||
#else
|
||||
where = malloc (bytes);
|
||||
#endif
|
||||
if (where == NULL)
|
||||
return NULL;
|
||||
memset (where, 0, bytes);
|
||||
|
|
|
@ -2124,7 +2124,9 @@ handle_printf_atsign (FILE *stream,
|
|||
#if defined(__MINGW__)
|
||||
return self;
|
||||
#else
|
||||
const int MAX_PATH = 1024;
|
||||
#ifndef MAX_PATH
|
||||
#define MAX_PATH 1024
|
||||
#endif
|
||||
char new_buf[MAX_PATH];
|
||||
#if HAVE_REALPATH
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue