mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-20 20:26:42 +00:00
Header fixups for MacOSX
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15864 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
c6559096e0
commit
9d78b79dce
14 changed files with 125 additions and 35 deletions
|
@ -28,14 +28,18 @@
|
|||
*/
|
||||
|
||||
#include "config.h"
|
||||
#ifndef NeXT_Foundation_LIBRARY
|
||||
#include <Foundation/NSArray.h>
|
||||
#include <Foundation/NSBundle.h>
|
||||
#include <Foundation/NSDictionary.h>
|
||||
#include <Foundation/NSString.h>
|
||||
#include <Foundation/NSLock.h>
|
||||
#include <Foundation/NSPathUtilities.h>
|
||||
#else
|
||||
#include <Foundation/Foundation.h>
|
||||
#endif
|
||||
#include "GSCompatibility.h"
|
||||
#include <base/Unicode.h>
|
||||
#include <gnustep/base/Unicode.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
@ -602,12 +606,15 @@ GSEncodingName(NSStringEncoding encoding)
|
|||
/**
|
||||
* <strong>deprecated</strong> Use GSEncodingName()
|
||||
*/
|
||||
#ifndef NeXT_Foundation_LIBRARY
|
||||
NSString*
|
||||
GetEncodingName(NSStringEncoding encoding)
|
||||
{
|
||||
return GSEncodingName(encoding);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_ICONV
|
||||
static const char *
|
||||
iconv_stringforencoding(NSStringEncoding encoding)
|
||||
{
|
||||
|
@ -617,6 +624,7 @@ iconv_stringforencoding(NSStringEncoding encoding)
|
|||
}
|
||||
return encodingTable[encoding]->iconv;
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* <strong>deprecated</strong>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue