Header tidyups, particularly updating of version compatibility macros.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24000 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-10-31 07:05:46 +00:00
parent 39944dd5e9
commit 57a828c7c7
113 changed files with 884 additions and 641 deletions

View file

@ -18,18 +18,17 @@
*
* You should have received a copy of the GNU Library 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. */
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02111 USA.
*/
#ifndef __NSGeometry_h_GNUSTEP_BASE_INCLUDE
#define __NSGeometry_h_GNUSTEP_BASE_INCLUDE
#import <GNUstepBase/GSVersionMacros.h>
/**** Included Headers *******************************************************/
#import <objc/objc.h>
#include <objc/objc.h>
#ifdef __OBJC__
#include <Foundation/NSString.h>
#endif
#import <Foundation/NSString.h>
#if defined(__cplusplus)
extern "C" {
@ -64,7 +63,7 @@ struct _NSPoint
float y;
};
#ifndef STRICT_OPENSTEP
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
/** Array of NSPoint structs. */
typedef NSPoint *NSPointArray;
/** Pointer to NSPoint struct. */
@ -84,7 +83,7 @@ struct _NSSize
float height;
};
#ifndef STRICT_OPENSTEP
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
/** Array of NSSize structs. */
typedef NSSize *NSSizeArray;
/** Pointer to NSSize struct. */
@ -105,7 +104,7 @@ struct _NSRect
NSSize size;
};
#ifndef STRICT_OPENSTEP
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
/** Array of NSRect structs. */
typedef NSRect *NSRectArray;
/** Pointer to NSRect struct. */
@ -504,7 +503,7 @@ NSContainsRect(NSRect aRect, NSRect bRect)
&& (NSMaxY(aRect) >= NSMaxY(bRect))) ? YES : NO;
}
#ifndef STRICT_OPENSTEP
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
GS_GEOM_SCOPE BOOL
NSIntersectsRect(NSRect aRect, NSRect bRect) GS_GEOM_ATTR;