gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-25 01:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidyup

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@4089 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-04-16 19:57:30 +00:00
parent f191665e66
commit 28b1174dd0
3 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Apr 16 20:16:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/include/NSGeometry.h: Don't pollute macro name space with
MAX and MIN.
* Source/include/NSRange.h: ditto
Thu Apr 15 10:50:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk> Thu Apr 15 10:50:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/include/NSHost.h: Use #ifdefs to prevent multiple inclusion. * Source/include/NSHost.h: Use #ifdefs to prevent multiple inclusion.

11
Headers/gnustep/base/NSGeometry.h
View file

@ -36,12 +36,14 @@
#define MAX(a,b) \ #define MAX(a,b) \
({typeof(a) _MAX_a = (a); typeof(b) _MAX_b = (b); \ ({typeof(a) _MAX_a = (a); typeof(b) _MAX_b = (b); \
_MAX_a > _MAX_b ? _MAX_a : _MAX_b; }) _MAX_a > _MAX_b ? _MAX_a : _MAX_b; })
#define GS_DEFINED_MAX
#endif #endif
#ifndef MIN #ifndef MIN
#define MIN(a,b) \ #define MIN(a,b) \
({typeof(a) _MIN_a = (a); typeof(b) _MIN_b = (b); \ ({typeof(a) _MIN_a = (a); typeof(b) _MIN_b = (b); \
_MIN_a < _MIN_b ? _MIN_a : _MIN_b; }) _MIN_a < _MIN_b ? _MIN_a : _MIN_b; })
#define GS_DEFINED_MIN
#endif #endif
/* Point definition. */ /* Point definition. */
@ -486,4 +488,13 @@ extern NSRect NSRectFromString(NSString* string);
#endif /* __OBJC__ */ #endif /* __OBJC__ */
#ifdef GS_DEFINED_MAX
#undef GS_DEFINED_MAX
#undef MAX
#endif
#ifdef GS_DEFINED_MIN
#undef GS_DEFINED_MIN
#undef MIN
#endif
#endif /* __NSGeometry_h_GNUSTEP_BASE_INCLUDE */ #endif /* __NSGeometry_h_GNUSTEP_BASE_INCLUDE */

12
Headers/gnustep/base/NSRange.h
View file

@ -33,12 +33,14 @@
#define MAX(a,b) \ #define MAX(a,b) \
({typeof(a) _MAX_a = (a); typeof(b) _MAX_b = (b); \ ({typeof(a) _MAX_a = (a); typeof(b) _MAX_b = (b); \
_MAX_a > _MAX_b ? _MAX_a : _MAX_b; }) _MAX_a > _MAX_b ? _MAX_a : _MAX_b; })
#define GS_DEFINED_MAX
#endif #endif
#ifndef MIN #ifndef MIN
#define MIN(a,b) \ #define MIN(a,b) \
({typeof(a) _MIN_a = (a); typeof(b) _MIN_b = (b); \ ({typeof(a) _MIN_a = (a); typeof(b) _MIN_b = (b); \
_MIN_a < _MIN_b ? _MIN_a : _MIN_b; }) _MIN_a < _MIN_b ? _MIN_a : _MIN_b; })
#define GS_DEFINED_MIN
#endif #endif
typedef struct _NSRange NSRange; typedef struct _NSRange NSRange;
@ -135,4 +137,14 @@ NSIntersectionRange (NSRange aRange, NSRange bRange)
extern NSString * extern NSString *
NSStringFromRange(NSRange range); NSStringFromRange(NSRange range);
#ifdef GS_DEFINED_MAX
#undef GS_DEFINED_MAX
#undef MAX
#endif
#ifdef GS_DEFINED_MIN
#undef GS_DEFINED_MIN
#undef MIN
#endif
#endif /* __NSRange_h_GNUSTEP_BASE_INCLUDE */ #endif /* __NSRange_h_GNUSTEP_BASE_INCLUDE */