mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
For the avoidance of confusion, remove references to obsolete header.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33562 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald
parent
44979bb7f4
commit
4a5cb96bef
23 changed files with 17229 additions and 2930 deletions
26
ChangeLog
26
ChangeLog
|
|
@ -1,3 +1,29 @@
|
|||
2011-07-15 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/GNUmakefile:
|
||||
* Source/GSRunLoopWatcher.h:
|
||||
* Source/NSXMLPrivate.h:
|
||||
* Source/unix/GSRunLoopCtxt.m:
|
||||
* Source/win32/GSFileHandle.m:
|
||||
* Source/win32/NSMessagePort.m:
|
||||
* Source/win32/GSRunLoopCtxt.m:
|
||||
* Source/win32/NSStream.m:
|
||||
* Source/common.h:
|
||||
* Source/Additions/GSXML.m:
|
||||
* Source/Additions/GSFunctions.m:
|
||||
* Source/Additions/GSObjCRuntime.m:
|
||||
* Source/GSURLPrivate.h:
|
||||
* SSL/GSSSLHandle.m:
|
||||
* Makefile.postamble:
|
||||
* configure.ac:
|
||||
* Headers/GNUstepBase/GSConfig.h.in:
|
||||
* Headers/GNUstepBase/GSFunctions.h:
|
||||
* Headers/GNUstepBase/GSObjCRuntime.h:
|
||||
* Headers/Foundation/NSZone.h:
|
||||
* Tools/make_strings/make_strings.m:
|
||||
* configure: regenerate
|
||||
Remove references to obsolete header.
|
||||
|
||||
2011-07-15 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/NSThread.m: Fix faulty assert.
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
#ifndef __NSZone_h_GNUSTEP_BASE_INCLUDE
|
||||
#define __NSZone_h_GNUSTEP_BASE_INCLUDE
|
||||
#import "GNUstepBase/GSVersionMacros.h"
|
||||
#import "GNUstepBase/preface.h"
|
||||
|
||||
/**
|
||||
* Primary structure representing an <code>NSZone</code>. Technically it
|
||||
|
|
|
|||
|
|
@ -226,7 +226,181 @@ typedef struct {
|
|||
#define GS_USE_AVAHI @HAVE_AVAHI@
|
||||
#define GS_USE_MDNS @HAVE_MDNS@
|
||||
#define GS_USE_ICU @HAVE_ICU@
|
||||
#import <GNUstepBase/preface.h>
|
||||
|
||||
|
||||
#if defined(__WIN32__) || defined(_WIN32) || defined(__MS_WIN32__)
|
||||
# if !defined(__WIN32__)
|
||||
# define __WIN32__
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if defined(__MINGW32__)
|
||||
# if !defined(__MINGW__)
|
||||
# define __MINGW__
|
||||
# endif
|
||||
# if !defined(__WIN32__)
|
||||
# define __WIN32__
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef __has_include
|
||||
# define __has_include(x) 0
|
||||
#endif
|
||||
#ifndef __has_feature
|
||||
# define __has_feature(x) 0
|
||||
#endif
|
||||
|
||||
#if defined(__WIN32__)
|
||||
#include <w32api.h>
|
||||
#ifndef _WIN32_WINNT
|
||||
#define _WIN32_WINNT Windows2000
|
||||
#endif
|
||||
#if !defined(WINVER)
|
||||
#define WINVER Windows2000
|
||||
#elif (WINVER < Windows2000)
|
||||
#undef WINVER
|
||||
#define WINVER Windows2000
|
||||
#endif
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
// Include the blocks runtime header if it's available (It shouldn't matter
|
||||
// that this doesn't work on compilers that don't support __has_include(),
|
||||
// because they also don't support blocks).
|
||||
#if __has_include(<objc/block_runtime.h>)
|
||||
# include <objc/block_runtime.h>
|
||||
#endif
|
||||
|
||||
#ifndef __WIN32__
|
||||
#include <sys/param.h> /* Hack to get rid of warning in GNU libc 2.0.3. */
|
||||
#endif
|
||||
|
||||
/* The following group of lines maintained by the gstep-base configure */
|
||||
#define GNUSTEP_BASE_VERSION @VERSION@
|
||||
#define GNUSTEP_BASE_MAJOR_VERSION @MAJOR_VERSION@
|
||||
#define GNUSTEP_BASE_MINOR_VERSION @MINOR_VERSION@
|
||||
#define GNUSTEP_BASE_SUBMINOR_VERSION @SUBMINOR_VERSION@
|
||||
#define GNUSTEP_BASE_GCC_VERSION @GCC_VERSION@
|
||||
|
||||
/* Do not use the following macros!
|
||||
*/
|
||||
#define OBJC_DEP(M) \
|
||||
({ static BOOL beenHere = NO; if (beenHere == NO) {\
|
||||
beenHere = YES; fprintf(stderr, "%s:%d %s", __FILE__, __LINE__, (M));}})
|
||||
|
||||
#define OBJC_MALLOC(VAR, TYPE, NUM) \
|
||||
(OBJC_DEP("OBJC_MALLOC is deprecated ... use malloc\n"),(VAR) = (TYPE *) malloc ((unsigned)(NUM)*sizeof(TYPE)))
|
||||
#define OBJC_VALLOC(VAR, TYPE, NUM) \
|
||||
(OBJC_DEP("OBJC_VALLOC is deprecated\n"),(VAR) = (TYPE *) valloc ((unsigned)(NUM)*sizeof(TYPE)))
|
||||
#define OBJC_ATOMIC_MALLOC(VAR, TYPE, NUM) \
|
||||
(OBJC_DEP("OBJC_ATOMIC_MALLOC is deprecated\n"),(VAR) = (TYPE *) malloc ((unsigned)(NUM)*sizeof(TYPE)))
|
||||
#define OBJC_REALLOC(VAR, TYPE, NUM) \
|
||||
(OBJC_DEP("OBJC_REALLOC is deprecated ... use realloc\n"),(VAR) = (TYPE *) realloc ((VAR), (unsigned)(NUM)*sizeof(TYPE)))
|
||||
#define OBJC_CALLOC(VAR, TYPE, NUM) \
|
||||
(OBJC_DEP("OBJC_CALLOC is deprecated ... use calloc\n"),(VAR) = (TYPE *) calloc ((unsigned)(NUM), sizeof(TYPE)))
|
||||
#define OBJC_FREE(PTR) (OBJC_DEP("OBJC_FREE is deprecated ... use free\n"), free (PTR))
|
||||
|
||||
#ifndef MAX
|
||||
#define MAX(a,b) \
|
||||
({__typeof__(a) _MAX_a = (a); __typeof__(b) _MAX_b = (b); \
|
||||
_MAX_a > _MAX_b ? _MAX_a : _MAX_b; })
|
||||
#endif
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(a,b) \
|
||||
({__typeof__(a) _MIN_a = (a); __typeof__(b) _MIN_b = (b); \
|
||||
_MIN_a < _MIN_b ? _MIN_a : _MIN_b; })
|
||||
#endif
|
||||
|
||||
#ifndef ABS
|
||||
#define ABS(a) \
|
||||
({__typeof__(a) _ABS_a = (a); \
|
||||
_ABS_a < 0 ? -_ABS_a : _ABS_a; })
|
||||
#endif
|
||||
|
||||
#ifndef STRINGIFY
|
||||
#define STRINGIFY(s) XSTRINGIFY(s)
|
||||
#define XSTRINGIFY(s) #s
|
||||
#endif
|
||||
|
||||
#ifndef OBJC_STRINGIFY
|
||||
#define OBJC_STRINGIFY(s) OBJC_XSTRINGIFY(s)
|
||||
#define OBJC_XSTRINGIFY(s) @#s
|
||||
#endif
|
||||
|
||||
#ifndef PTR2LONG
|
||||
#define PTR2LONG(P) (((char*)(P))-(char*)0)
|
||||
#endif
|
||||
#ifndef LONG2PTR
|
||||
#define LONG2PTR(L) (((char*)0)+(L))
|
||||
#endif
|
||||
|
||||
#if VSPRINTF_RETURNS_LENGTH
|
||||
#define VSPRINTF_LENGTH(VSPF_CALL) (VSPF_CALL)
|
||||
#else
|
||||
#define VSPRINTF_LENGTH(VSPF_CALL) strlen((VSPF_CALL))
|
||||
#endif /* VSPRINTF_RETURNS_LENGTH */
|
||||
|
||||
#if VASPRINTF_RETURNS_LENGTH
|
||||
#define VASPRINTF_LENGTH(VASPF_CALL) (VASPF_CALL)
|
||||
#else
|
||||
#define VASPRINTF_LENGTH(VASPF_CALL) strlen((VASPF_CALL))
|
||||
#endif /* VSPRINTF_RETURNS_LENGTH */
|
||||
|
||||
/* Evil hack to stop gcc-4.1 complaining about a dealloc method which
|
||||
* does not call the superclass implementation.
|
||||
*/
|
||||
#define GSNOSUPERDEALLOC if (0) [super dealloc]
|
||||
|
||||
#ifndef CF_EXCLUDE_CSTD_HEADERS
|
||||
#include <sys/types.h>
|
||||
#include <stdarg.h>
|
||||
#include <assert.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <float.h>
|
||||
#include <limits.h>
|
||||
#include <locale.h>
|
||||
#include <math.h>
|
||||
#include <setjmp.h>
|
||||
#include <signal.h>
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <inttypes.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
// Strong has different semantics in GC and ARC modes, so we need to have a
|
||||
// macro that picks the correct one.
|
||||
#if __OBJC_GC__
|
||||
# define GS_GC_STRONG __strong
|
||||
#else
|
||||
# define GS_GC_STRONG
|
||||
#endif
|
||||
|
||||
#if !__has_feature(objc_arc)
|
||||
# if __OBJC_GC__
|
||||
# define __strong __attribute__((objc_gc(strong)))
|
||||
# define __weak __attribute__((objc_gc(weak)))
|
||||
# else
|
||||
# define __strong
|
||||
# define __weak
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef __unsafe_unretained
|
||||
# if !__has_feature(objc_arc)
|
||||
# define __unsafe_unretained
|
||||
# endif
|
||||
#endif
|
||||
#ifndef __bridge
|
||||
# if !__has_feature(objc_arc)
|
||||
# define __bridge
|
||||
# endif
|
||||
#endif
|
||||
#endif /* included_GSConfig_h */
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@
|
|||
#define __GSFunctions_h_GNUSTEP_BASE_INCLUDE
|
||||
#import "GNUstepBase/GNUstep.h"
|
||||
|
||||
#import "GNUstepBase/preface.h"
|
||||
#import "GNUstepBase/GSObjCRuntime.h"
|
||||
|
||||
#if defined(__cplusplus)
|
||||
|
|
|
|||
|
|
@ -34,7 +34,46 @@
|
|||
#import <GNUstepBase/GSConfig.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <objc/objc.h>
|
||||
|
||||
#if NeXT_RUNTIME
|
||||
#include <objc/objc.h>
|
||||
#include <objc/objc-class.h>
|
||||
#include <objc/objc-runtime.h>
|
||||
#ifndef _C_ATOM
|
||||
#define _C_ATOM '%'
|
||||
#endif
|
||||
#define _F_CONST 0x01
|
||||
#define _F_IN 0x01
|
||||
#define _F_OUT 0x02
|
||||
#define _F_INOUT 0x03
|
||||
#define _F_BYCOPY 0x04
|
||||
#define _F_ONEWAY 0x08
|
||||
#define _C_CONST 'r'
|
||||
#define _C_IN 'n'
|
||||
#define _C_INOUT 'N'
|
||||
#define _C_OUT 'o'
|
||||
#define _C_BYCOPY 'O'
|
||||
#define _C_ONEWAY 'V'
|
||||
#else /* GNU Objective C Runtime */
|
||||
#include <objc/objc.h>
|
||||
#if defined (__GNU_LIBOBJC__)
|
||||
#include <objc/runtime.h>
|
||||
#else
|
||||
#include <objc/objc-api.h>
|
||||
#include <objc/encoding.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Hack for older compiler versions that don't have all defines
|
||||
* needed in objc-api.h
|
||||
*/
|
||||
#ifndef _C_LNG_LNG
|
||||
#define _C_LNG_LNG 'q'
|
||||
#endif
|
||||
#ifndef _C_ULNG_LNG
|
||||
#define _C_ULNG_LNG 'Q'
|
||||
#endif
|
||||
|
||||
#if OBJC2RUNTIME
|
||||
/* We have a real ObjC2 runtime.
|
||||
|
|
@ -47,8 +86,6 @@
|
|||
#include <ObjectiveC2/runtime.h>
|
||||
#endif
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@ after-distclean::
|
|||
rm -f config.status config.log config.cache TAGS config.mak base.make \
|
||||
Headers/GNUstepBase/config.h \
|
||||
Headers/GNUstepBase/GSConfig.h \
|
||||
Headers/GNUstepBase/preface.h \
|
||||
$(END_ECHO)
|
||||
|
||||
# Things to do before checking
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@
|
|||
|
||||
#if defined(__WIN32__)
|
||||
#include <windows.h>
|
||||
#define GNUSTEP_BASE_SOCKET_MESSAGE (WM_USER + 1)
|
||||
#endif
|
||||
|
||||
/* Because openssl uses `id' as variable name sometime,
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
*/
|
||||
|
||||
#import "common.h"
|
||||
#import "GNUstepBase/preface.h"
|
||||
#import "GNUstepBase/GSFunctions.h"
|
||||
#import "GNUstepBase/NSDebug+GNUstepBase.h"
|
||||
#ifndef NeXT_Foundation_LIBRARY
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
*/
|
||||
|
||||
#import "common.h"
|
||||
#import "GNUstepBase/preface.h"
|
||||
#ifndef NeXT_Foundation_LIBRARY
|
||||
#import "Foundation/NSArray.h"
|
||||
#import "Foundation/NSAutoreleasePool.h"
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@
|
|||
|
||||
#include <string.h>
|
||||
#import "common.h"
|
||||
#import "GNUstepBase/preface.h"
|
||||
#import "GNUstepBase/Unicode.h"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -146,7 +146,6 @@ NSThread+GNUstepBase.h \
|
|||
NSURL+GNUstepBase.h \
|
||||
Unicode.h \
|
||||
GNUstep.h \
|
||||
preface.h \
|
||||
Additions.h
|
||||
|
||||
|
||||
|
|
@ -455,7 +454,6 @@ HEADERS_INSTALL = \
|
|||
|
||||
GENERATED_HFILES = \
|
||||
dynamic-load.h \
|
||||
$(HEADER_DIR_BASE)/preface.h \
|
||||
$(GNUSTEP_TARGET_DIR)/config.h \
|
||||
$(GNUSTEP_TARGET_DIR)/common.h \
|
||||
$(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@
|
|||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "GNUstepBase/preface.h"
|
||||
#include <Foundation/NSRunLoop.h>
|
||||
|
||||
@class NSDate;
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@
|
|||
* Headers needed by many URL loading classes
|
||||
*/
|
||||
#import "config.h"
|
||||
#import "GNUstepBase/preface.h"
|
||||
#import "Foundation/NSArray.h"
|
||||
#import "Foundation/NSAutoreleasePool.h"
|
||||
#import "Foundation/NSData.h"
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#define EXPOSE_NSXMLDocument_IVARS 1
|
||||
#define EXPOSE_NSXMLElement_IVARS 1
|
||||
#define EXPOSE_NSXMLNode_IVARS 1
|
||||
#import "GNUstepBase/preface.h"
|
||||
#import "Foundation/NSArray.h"
|
||||
#import "Foundation/NSData.h"
|
||||
#import "Foundation/NSDebug.h"
|
||||
|
|
|
|||
|
|
@ -14,10 +14,6 @@
|
|||
#import <Foundation/Foundation.h>
|
||||
#endif
|
||||
|
||||
/* GNUstepBase/GSConfig.h includes <GNUstepBase/preface.h> so
|
||||
* we import local versions first.
|
||||
*/
|
||||
#import "GNUstepBase/preface.h"
|
||||
#import "GNUstepBase/GSConfig.h"
|
||||
|
||||
/* Set localisation macro for use within the base library itsself.
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
#import "common.h"
|
||||
|
||||
#import "GNUstepBase/preface.h"
|
||||
#import "Foundation/NSError.h"
|
||||
#import "Foundation/NSNotification.h"
|
||||
#import "Foundation/NSNotificationQueue.h"
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
|
||||
#include "common.h"
|
||||
|
||||
#include "GNUstepBase/preface.h"
|
||||
#include "Foundation/NSObject.h"
|
||||
#include "Foundation/NSData.h"
|
||||
#include "Foundation/NSArray.h"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
#import "common.h"
|
||||
|
||||
#import "GNUstepBase/preface.h"
|
||||
#import "Foundation/NSError.h"
|
||||
#import "Foundation/NSNotification.h"
|
||||
#import "Foundation/NSNotificationQueue.h"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
*/
|
||||
|
||||
#include "common.h"
|
||||
#include "GNUstepBase/preface.h"
|
||||
#include "GNUstepBase/GSLock.h"
|
||||
#include "Foundation/NSArray.h"
|
||||
#include "Foundation/NSNotification.h"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
|
||||
*/
|
||||
#include "common.h"
|
||||
#include "GNUstepBase/preface.h"
|
||||
|
||||
#import "Foundation/NSData.h"
|
||||
#import "Foundation/NSArray.h"
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
|
||||
*/
|
||||
|
||||
#import "GNUstepBase/preface.h"
|
||||
#import "common.h"
|
||||
#import "Foundation/NSString.h"
|
||||
#import "Foundation/NSAutoreleasePool.h"
|
||||
|
|
|
|||
|
|
@ -2992,6 +2992,5 @@ AC_SUBST(GCC_VERSION)
|
|||
#--------------------------------------------------------------------
|
||||
# Write the Makefiles
|
||||
#--------------------------------------------------------------------
|
||||
AC_CONFIG_FILES([config.mak base.make Headers/GNUstepBase/GSConfig.h
|
||||
Headers/GNUstepBase/preface.h])
|
||||
AC_CONFIG_FILES([config.mak base.make Headers/GNUstepBase/GSConfig.h])
|
||||
AC_OUTPUT
|
||||
|
|
|
|||
Loading…
Reference in a new issue