gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 16:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use NSCParameterAssert, -lobjc with NeXT_RUNTIME

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@10023 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2001-05-25 15:59:06 +00:00
parent 61e4c24bb6
commit 3c19c663de
5 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2001-05-25 Adam Fedor <fedor@gnu.org>
* configure.in: Use -lobjc with NeXT_RUNTIME.
* Headers/gnustep/base/behavior.h: Include objc.h on NeXT_RUNTIME.
* Source/GSFormat.m: Replace assert with NSCParameterAssert
2001-05-23 Adam Fedor <fedor@gnu.org> 2001-05-23 Adam Fedor <fedor@gnu.org>
* configure.in: Check for libgiconv * configure.in: Check for libgiconv

4
Headers/gnustep/base/behavior.h
View file

@ -24,7 +24,11 @@
#ifndef __behavior_h_GNUSTEP_BASE_INCLUDE #ifndef __behavior_h_GNUSTEP_BASE_INCLUDE
#define __behavior_h_GNUSTEP_BASE_INCLUDE #define __behavior_h_GNUSTEP_BASE_INCLUDE
#if NeXT_RUNTIME
#include <objc/objc.h>
#else
#include <objc/objc-api.h> #include <objc/objc-api.h>
#endif
/* Call this method from CLASS's +initialize method to add a behavior /* Call this method from CLASS's +initialize method to add a behavior
to CLASS. A "behavior" is like a protocol with an implementation. to CLASS. A "behavior" is like a protocol with an implementation.

6
Source/GSFormat.m
View file

@ -611,7 +611,7 @@ parse_one_spec (const unichar *format, size_t posn, struct printf_spec *spec,
case 'z': case 'z':
case 'Z': case 'Z':
/* ints are size_ts. */ /* ints are size_ts. */
assert (sizeof (size_t) <= sizeof (unsigned long long int)); NSCParameterAssert (sizeof (size_t) <= sizeof (unsigned long long int));
#if defined(LONG_LONG_MAX) #if defined(LONG_LONG_MAX)
#if LONG_MAX != LONG_LONG_MAX #if LONG_MAX != LONG_LONG_MAX
spec->info.is_long_double = sizeof (size_t) > sizeof (unsigned long int); spec->info.is_long_double = sizeof (size_t) > sizeof (unsigned long int);
@ -620,7 +620,7 @@ parse_one_spec (const unichar *format, size_t posn, struct printf_spec *spec,
spec->info.is_long = sizeof (size_t) > sizeof (unsigned int); spec->info.is_long = sizeof (size_t) > sizeof (unsigned int);
break; break;
case 't': case 't':
assert (sizeof (ptrdiff_t) <= sizeof (long long int)); NSCParameterAssert (sizeof (ptrdiff_t) <= sizeof (long long int));
#if defined(LONG_LONG_MAX) #if defined(LONG_LONG_MAX)
#if LONG_MAX != LONG_LONG_MAX #if LONG_MAX != LONG_LONG_MAX
spec->info.is_long_double = (sizeof (ptrdiff_t) > sizeof (long int)); spec->info.is_long_double = (sizeof (ptrdiff_t) > sizeof (long int));
@ -629,7 +629,7 @@ parse_one_spec (const unichar *format, size_t posn, struct printf_spec *spec,
spec->info.is_long = sizeof (ptrdiff_t) > sizeof (int); spec->info.is_long = sizeof (ptrdiff_t) > sizeof (int);
break; break;
case 'j': case 'j':
assert (sizeof (uintmax_t) <= sizeof (unsigned long long int)); NSCParameterAssert (sizeof (uintmax_t) <= sizeof (unsigned long long int));
#if defined(LONG_LONG_MAX) #if defined(LONG_LONG_MAX)
#if LONG_MAX != LONG_LONG_MAX #if LONG_MAX != LONG_LONG_MAX
spec->info.is_long_double = (sizeof (uintmax_t) spec->info.is_long_double = (sizeof (uintmax_t)

2
configure vendored
View file

@ -1187,7 +1187,7 @@ echo $ac_n "checking the Objective-C runtime""... $ac_c" 1>&6
echo "configure:1188: checking the Objective-C runtime" >&5 echo "configure:1188: checking the Objective-C runtime" >&5
if test "$OBJC_RUNTIME_LIB" = "nx"; then if test "$OBJC_RUNTIME_LIB" = "nx"; then
echo "$ac_t""NeXT" 1>&6 echo "$ac_t""NeXT" 1>&6
LIBOBJC='' LIBOBJC='-lobjc'
CPPFLAGS="$CPPFLAGS -fnext-runtime -DNeXT_RUNTIME" CPPFLAGS="$CPPFLAGS -fnext-runtime -DNeXT_RUNTIME"
else else
echo "$ac_t""GNU" 1>&6 echo "$ac_t""GNU" 1>&6

2
configure.in
View file

@ -85,7 +85,7 @@ OBJC_RUNTIME_LIB=`echo $LIBRARY_COMBO | tr '-' ' ' | awk '{print $1}'`
AC_MSG_CHECKING(the Objective-C runtime) AC_MSG_CHECKING(the Objective-C runtime)
if test "$OBJC_RUNTIME_LIB" = "nx"; then if test "$OBJC_RUNTIME_LIB" = "nx"; then
AC_MSG_RESULT(NeXT) AC_MSG_RESULT(NeXT)
LIBOBJC='' LIBOBJC='-lobjc'
CPPFLAGS="$CPPFLAGS -fnext-runtime -DNeXT_RUNTIME" CPPFLAGS="$CPPFLAGS -fnext-runtime -DNeXT_RUNTIME"
else else
AC_MSG_RESULT(GNU) AC_MSG_RESULT(GNU)