mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
fix includes to iumports
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29894 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
804c45c26c
commit
0ec0645f11
18 changed files with 52 additions and 51 deletions
|
@ -41,10 +41,10 @@
|
|||
* The default action is to send a proxy.
|
||||
*/
|
||||
|
||||
#include <Foundation/NSConnection.h>
|
||||
#include <Foundation/NSDistantObject.h>
|
||||
#include <Foundation/NSPortCoder.h>
|
||||
#include <Foundation/NSPort.h>
|
||||
#import <Foundation/NSConnection.h>
|
||||
#import <Foundation/NSDistantObject.h>
|
||||
#import <Foundation/NSPortCoder.h>
|
||||
#import <Foundation/NSPort.h>
|
||||
|
||||
/*
|
||||
* Distributed Objects identifiers
|
||||
|
|
|
@ -32,12 +32,12 @@
|
|||
#define __INCLUDED_GCOBJECT_H
|
||||
|
||||
#ifndef NeXT_Foundation_LIBRARY
|
||||
#include <Foundation/NSObject.h>
|
||||
#include <Foundation/NSArray.h>
|
||||
#include <Foundation/NSDictionary.h>
|
||||
#include <Foundation/NSMapTable.h>
|
||||
#import <Foundation/NSObject.h>
|
||||
#import <Foundation/NSArray.h>
|
||||
#import <Foundation/NSDictionary.h>
|
||||
#import <Foundation/NSMapTable.h>
|
||||
#else
|
||||
#include <Foundation/Foundation.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
#endif
|
||||
|
||||
#if defined(__cplusplus)
|
||||
|
|
|
@ -220,7 +220,7 @@ typedef struct {
|
|||
|
||||
#define OBJC2RUNTIME @OBJC2RUNTIME@
|
||||
|
||||
#include <GNUstepBase/preface.h>
|
||||
#import <GNUstepBase/preface.h>
|
||||
|
||||
#endif /* included_GSConfig_h */
|
||||
|
||||
|
|
|
@ -25,12 +25,12 @@
|
|||
#ifndef __GSFileHandle_h_GNUSTEP_BASE_INCLUDE
|
||||
#define __GSFileHandle_h_GNUSTEP_BASE_INCLUDE
|
||||
|
||||
#include <Foundation/NSFileHandle.h>
|
||||
#include <Foundation/NSArray.h>
|
||||
#include <Foundation/NSDictionary.h>
|
||||
#include <Foundation/NSRunLoop.h>
|
||||
#import <Foundation/NSFileHandle.h>
|
||||
#import <Foundation/NSArray.h>
|
||||
#import <Foundation/NSDictionary.h>
|
||||
#import <Foundation/NSRunLoop.h>
|
||||
|
||||
#include <GNUstepBase/GSConfig.h>
|
||||
#import <GNUstepBase/GSConfig.h>
|
||||
|
||||
#if USE_ZLIB
|
||||
#include <zlib.h>
|
||||
|
|
|
@ -26,10 +26,10 @@
|
|||
|
||||
#ifndef __GSFunctions_h_GNUSTEP_BASE_INCLUDE
|
||||
#define __GSFunctions_h_GNUSTEP_BASE_INCLUDE
|
||||
#include "GNUstepBase/GNUstep.h"
|
||||
#import "GNUstepBase/GNUstep.h"
|
||||
|
||||
#include "GNUstepBase/preface.h"
|
||||
#include "GNUstepBase/GSObjCRuntime.h"
|
||||
#import "GNUstepBase/preface.h"
|
||||
#import "GNUstepBase/GSObjCRuntime.h"
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
|
|
|
@ -27,11 +27,11 @@
|
|||
#define __GSLocale_H_
|
||||
|
||||
#ifndef NeXT_Foundation_LIBRARY
|
||||
#include <Foundation/NSString.h>
|
||||
#import <Foundation/NSString.h>
|
||||
#else
|
||||
#include <Foundation/Foundation.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
#endif
|
||||
#include "GSObjCRuntime.h"
|
||||
#import "GSObjCRuntime.h"
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
|
|
|
@ -29,12 +29,12 @@
|
|||
#define INCLUDED_GS_LOCK_H
|
||||
|
||||
#ifndef NeXT_Foundation_LIBRARY
|
||||
#include <Foundation/NSLock.h>
|
||||
#import <Foundation/NSLock.h>
|
||||
#else
|
||||
#include <Foundation/Foundation.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
#endif
|
||||
|
||||
#include "GNUstepBase/GSObjCRuntime.h"
|
||||
#import "GNUstepBase/GSObjCRuntime.h"
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
|
|
|
@ -30,8 +30,8 @@
|
|||
#ifndef __GSObjCRuntime_h_GNUSTEP_BASE_INCLUDE
|
||||
#define __GSObjCRuntime_h_GNUSTEP_BASE_INCLUDE
|
||||
|
||||
#include <GNUstepBase/GSVersionMacros.h>
|
||||
#include <GNUstepBase/GSConfig.h>
|
||||
#import <GNUstepBase/GSVersionMacros.h>
|
||||
#import <GNUstepBase/GSConfig.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <objc/objc.h>
|
||||
|
|
|
@ -34,16 +34,16 @@
|
|||
|
||||
#ifndef __GSXML_h_GNUSTEP_BASE_INCLUDE
|
||||
#define __GSXML_h_GNUSTEP_BASE_INCLUDE
|
||||
#include <GNUstepBase/GSVersionMacros.h>
|
||||
#import <GNUstepBase/GSVersionMacros.h>
|
||||
|
||||
#if OS_API_VERSION(GS_API_NONE,GS_API_LATEST)
|
||||
|
||||
#ifndef NeXT_Foundation_LIBRARY
|
||||
#include <Foundation/NSObject.h>
|
||||
#include <Foundation/NSString.h>
|
||||
#include <Foundation/NSDictionary.h>
|
||||
#import <Foundation/NSObject.h>
|
||||
#import <Foundation/NSString.h>
|
||||
#import <Foundation/NSDictionary.h>
|
||||
#else
|
||||
#include <Foundation/Foundation.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
#endif
|
||||
|
||||
#if defined(__cplusplus)
|
||||
|
@ -463,8 +463,8 @@ extern "C" {
|
|||
|
||||
|
||||
|
||||
#include <Foundation/NSURLHandle.h>
|
||||
#include <Foundation/NSURLConnection.h>
|
||||
#import <Foundation/NSURLHandle.h>
|
||||
#import <Foundation/NSURLConnection.h>
|
||||
|
||||
@class NSArray;
|
||||
@class NSDictionary;
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
#ifndef __Unicode_h_OBJECTS_INCLUDE
|
||||
#define __Unicode_h_OBJECTS_INCLUDE
|
||||
#include <GNUstepBase/GSVersionMacros.h>
|
||||
#import <GNUstepBase/GSVersionMacros.h>
|
||||
|
||||
#import <Foundation/NSString.h> /* For standard string encodings */
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#define __NSByteOrder_h_GNUSTEP_BASE_INCLUDE
|
||||
#import <GNUstepBase/GSVersionMacros.h>
|
||||
|
||||
#include <GNUstepBase/GSConfig.h>
|
||||
#import <GNUstepBase/GSConfig.h>
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
|
|
|
@ -228,7 +228,7 @@ extern "C" {
|
|||
/*
|
||||
* Include GSConfig.h for typedefs/defines of uint8_t, int32_t int64_t
|
||||
*/
|
||||
#include <GNUstepBase/GSConfig.h>
|
||||
#import <GNUstepBase/GSConfig.h>
|
||||
|
||||
|
||||
/** <override-subclass />
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#define __NSDecimal_h_GNUSTEP_BASE_INCLUDE
|
||||
#import <GNUstepBase/GSVersionMacros.h>
|
||||
|
||||
#include <GNUstepBase/GSConfig.h>
|
||||
#import <GNUstepBase/GSConfig.h>
|
||||
|
||||
#import <Foundation/NSObject.h>
|
||||
|
||||
|
|
|
@ -79,7 +79,7 @@ enum
|
|||
*/
|
||||
typedef NSUInteger NSEnumerationOptions;
|
||||
|
||||
#include <GNUstepBase/GSObjCRuntime.h>
|
||||
#import <GNUstepBase/GSObjCRuntime.h>
|
||||
|
||||
#if OS_API_VERSION(100500,GS_API_LATEST)
|
||||
GS_EXPORT NSString *NSStringFromProtocol(Protocol *aProtocol);
|
||||
|
|
|
@ -25,10 +25,10 @@
|
|||
|
||||
#ifndef __NSUserDefaults_h_OBJECTS_INCLUDE
|
||||
#define __NSUserDefaults_h_OBJECTS_INCLUDE
|
||||
#include <GNUstepBase/GSVersionMacros.h>
|
||||
#import <GNUstepBase/GSVersionMacros.h>
|
||||
|
||||
#include <Foundation/NSObject.h>
|
||||
#include <Foundation/NSString.h>
|
||||
#import <Foundation/NSObject.h>
|
||||
#import <Foundation/NSString.h>
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
|
|
|
@ -323,7 +323,8 @@ static BOOL permitSSLv2 = NO;
|
|||
RELEASE(final);
|
||||
if (err != SSL_ERROR_NONE)
|
||||
{
|
||||
if (err != SSL_ERROR_WANT_READ && err != SSL_ERROR_WANT_WRITE)
|
||||
if (err != SSL_ERROR_WANT_READ && err != SSL_ERROR_WANT_WRITE
|
||||
&& (err != SSL_ERROR_SYSCALL || errno != 0))
|
||||
{
|
||||
/*
|
||||
* Some other error ... not just a timeout or disconnect
|
||||
|
|
|
@ -41,10 +41,10 @@
|
|||
#define EXPOSE_NSHTTPCookie_IVARS 1
|
||||
#import "GSURLPrivate.h"
|
||||
#import "Foundation/NSSet.h"
|
||||
#include "Foundation/NSValue.h"
|
||||
#include "Foundation/NSString.h"
|
||||
#include "Foundation/NSCalendarDate.h"
|
||||
#include "GNUstepBase/Unicode.h"
|
||||
#import "Foundation/NSValue.h"
|
||||
#import "Foundation/NSString.h"
|
||||
#import "Foundation/NSCalendarDate.h"
|
||||
#import "GNUstepBase/Unicode.h"
|
||||
#import "GNUstepBase/NSObject+GNUstepBase.h"
|
||||
|
||||
NSString * const NSHTTPCookieComment = @"Comment";
|
||||
|
|
|
@ -26,11 +26,11 @@
|
|||
#define EXPOSE_NSHTTPCookieStorage_IVARS 1
|
||||
#import "GSURLPrivate.h"
|
||||
#import "Foundation/NSSet.h"
|
||||
#include "Foundation/NSArray.h"
|
||||
#include "Foundation/NSFileManager.h"
|
||||
#include "Foundation/NSPathUtilities.h"
|
||||
#include "Foundation/NSString.h"
|
||||
#include "Foundation/NSDistributedNotificationCenter.h"
|
||||
#import "Foundation/NSArray.h"
|
||||
#import "Foundation/NSFileManager.h"
|
||||
#import "Foundation/NSPathUtilities.h"
|
||||
#import "Foundation/NSString.h"
|
||||
#import "Foundation/NSDistributedNotificationCenter.h"
|
||||
#import "GNUstepBase/NSObject+GNUstepBase.h"
|
||||
|
||||
NSString * const NSHTTPCookieManagerAcceptPolicyChangedNotification
|
||||
|
|
Loading…
Reference in a new issue