mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Try to clean up after last commit.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33625 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer
parent
155e17d050
commit
254aa22792
4 changed files with 17 additions and 281 deletions
|
|
@ -1,3 +1,9 @@
|
|||
2011-07-24 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Source/NSAssertionHandler.m,
|
||||
* Headers/GNUstepBase/GSConfig.h.in: Clean up after last commit.
|
||||
* Headers/GNUstepBase/preface.h.in: Remove this obsolete file.
|
||||
|
||||
2011-07-24 13:09 David Chisnall <theraven@gna.org>
|
||||
|
||||
* Headers/Foundation/NSArray.h,
|
||||
|
|
|
|||
|
|
@ -249,6 +249,9 @@ typedef struct {
|
|||
#ifndef __has_feature
|
||||
# define __has_feature(x) 0
|
||||
#endif
|
||||
#ifndef __has_builtin
|
||||
# define __has_builtin(x) 0
|
||||
#endif
|
||||
|
||||
#if defined(__WIN32__)
|
||||
#include <w32api.h>
|
||||
|
|
@ -402,5 +405,12 @@ typedef struct {
|
|||
# define __bridge
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if __has_builtin(__builtin_unreachable)
|
||||
# define GS_UNREACHABLE() __builtin_unreachable()
|
||||
#else
|
||||
# define GS_UNREACHABLE() abort()
|
||||
#endif
|
||||
|
||||
#endif /* included_GSConfig_h */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,280 +0,0 @@
|
|||
/* General purpose definitions for the GNU Objective-C Library.
|
||||
Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
|
||||
|
||||
Written by: Andrew Kachites McCallum <mccallum@gnu.ai.mit.edu>
|
||||
Created: May 1993
|
||||
|
||||
This file is part of the GNUstep Base Library.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free
|
||||
Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
Boston, MA 02111 USA.
|
||||
*/
|
||||
|
||||
#ifndef __preface_h_OBJECTS_INCLUDE
|
||||
#define __preface_h_OBJECTS_INCLUDE
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.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
|
||||
#ifndef __has_builtin
|
||||
# define __has_builtin(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>
|
||||
#define GNUSTEP_BASE_SOCKET_MESSAGE (WM_USER + 1)
|
||||
#endif
|
||||
|
||||
/* From CoreFoundation.h */
|
||||
#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
|
||||
|
||||
/* FIXME: Should not all these includes go in GSObjCRuntime.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
|
||||
|
||||
// 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
|
||||
|
||||
/*
|
||||
* 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
|
||||
|
||||
#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
|
||||
|
||||
#if __has_builtin(__builtin_unreachable)
|
||||
# define GS_UNREACHABLE() __builtin_unreachable()
|
||||
#else
|
||||
# define GS_UNREACHABLE() abort()
|
||||
#endif
|
||||
|
||||
#endif /* __preface_h_OBJECTS_INCLUDE */
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
*/
|
||||
|
||||
#import "common.h"
|
||||
#import "GNUstepBase/preface.h"
|
||||
#import "GNUstepBase/GSConfig.h"
|
||||
#import "Foundation/NSException.h"
|
||||
#import "Foundation/NSDictionary.h"
|
||||
#import "Foundation/NSThread.h"
|
||||
|
|
|
|||
Loading…
Reference in a new issue