diff --git a/Headers/gnustep/base/NSGeometry.h b/Headers/gnustep/base/NSGeometry.h index c2dfa7a75..c36e059c1 100644 --- a/Headers/gnustep/base/NSGeometry.h +++ b/Headers/gnustep/base/NSGeometry.h @@ -273,23 +273,8 @@ NSDivideRect(NSRect aRect, /* Returns a rectangle obtained by expanding ARECT minimally * so that all four of its defining components are integers. */ -GS_GEOM_SCOPE NSRect -NSIntegralRect(NSRect aRect) GS_GEOM_ATTR; - -GS_GEOM_SCOPE NSRect -NSIntegralRect(NSRect aRect) -{ - NSRect rect; - - if (NSIsEmptyRect(aRect)) - return NSMakeRect(0, 0, 0, 0); - - rect.origin.x = floor(aRect.origin.x); - rect.origin.y = floor(aRect.origin.y); - rect.size.width = ceil(aRect.size.width); - rect.size.height = ceil(aRect.size.height); - return rect; -} +extern NSRect +NSIntegralRect(NSRect aRect); /** Compute a Third Rectangle from Two Rectangles... **/ diff --git a/Source/NSGeometry.m b/Source/NSGeometry.m index abda3947b..7e3b493b0 100644 --- a/Source/NSGeometry.m +++ b/Source/NSGeometry.m @@ -38,6 +38,21 @@ /**** Function Implementations ***********************************************/ /* Most of these are implemented in the header file as inline functkions */ +NSRect +NSIntegralRect(NSRect aRect) +{ + NSRect rect; + + if (NSIsEmptyRect(aRect)) + return NSMakeRect(0, 0, 0, 0); + + rect.origin.x = floor(aRect.origin.x); + rect.origin.y = floor(aRect.origin.y); + rect.size.width = ceil(aRect.size.width); + rect.size.height = ceil(aRect.size.height); + return rect; +} + void NSDivideRect(NSRect aRect, NSRect *slice,