Fix the build with the pure non-fragile ABI by declaring macros before using them.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33724 72102866-910b-0410-8b05-ffd578937521

Source/NSBundle.m

@@ -31,8 +31,8 @@
    $Date$ $Revision$
 */
 
-#import "common.h"
 #define	EXPOSE_NSBundle_IVARS	1
+#import "common.h"
 #include "objc-load.h"
 #import "Foundation/NSBundle.h"
 #import "Foundation/NSException.h"

Source/NSDateFormatter.m

@@ -25,8 +25,16 @@
    $Date$ $Revision$
    */
 
-#import "common.h"
+#define	GS_NSDateFormatter_IVARS \
+  NSUInteger _behavior; \
+  NSLocale   *_locale; \
+  NSTimeZone *_tz; \
+  NSDateFormatterStyle _timeStyle; \
+  NSDateFormatterStyle _dateStyle; \
+  void      *_formatter
+
 #define	EXPOSE_NSDateFormatter_IVARS	1
+#import "common.h"
 #import "Foundation/NSArray.h"
 #import "Foundation/NSDate.h"
 #import "Foundation/NSDictionary.h"
@@ -82,13 +90,6 @@ NSToUDateFormatStyle (NSDateFormatterStyle style)
   return -1;
 }
 
-#define	GS_NSDateFormatter_IVARS \
-  NSUInteger _behavior; \
-  NSLocale   *_locale; \
-  NSTimeZone *_tz; \
-  NSDateFormatterStyle _timeStyle; \
-  NSDateFormatterStyle _dateStyle; \
-  void      *_formatter
 
 #define	GSInternal		NSDateFormatterInternal
 #include	"GSInternal.h"

Source/NSLocale.m

@@ -22,6 +22,7 @@
    Boston, MA 02110-1301, USA.
 */
 
+#define	EXPOSE_NSLocale_IVARS	1
 #import "common.h"
 #import "Foundation/NSLocale.h"
 #import "Foundation/NSArray.h"

Source/NSNumberFormatter.m

@@ -27,6 +27,24 @@
    $Date$ $Revision$
    */
 
+/* Unfortunately, libicu does not define the maximum values allowed for all
+   of these attributes.  We define them here to, though.
+   These are based off libicu version 4.6.
+ */
+#define MAX_SYMBOLS 27
+#define MAX_TEXTATTRIBUTES 8
+#define MAX_ATTRIBUTES 20
+
+#define GS_NSNumberFormatter_IVARS \
+  NSUInteger	_behavior; \
+  BOOL		_genDecimal; \
+  NSUInteger	_style; \
+  NSLocale	*_locale; \
+  void		*_formatter; \
+  id		_symbols[MAX_SYMBOLS]; \
+  id		_textAttributes[MAX_TEXTATTRIBUTES]; \
+  int		_attributes[MAX_ATTRIBUTES]
+
 #import "common.h"
 #define	EXPOSE_NSNumberFormatter_IVARS	1
 #import "Foundation/NSAttributedString.h"
@@ -51,14 +69,6 @@
 
 #define BUFFER_SIZE 1024
 
-/* Unfortunately, libicu does not define the maximum values allowed for all
-   of these attributes.  We define them here to, though.
-   These are based off libicu version 4.6.
- */
-#define MAX_SYMBOLS 27
-#define MAX_TEXTATTRIBUTES 8
-#define MAX_ATTRIBUTES 20
-
 #if GS_USE_ICU == 1
 static inline UNumberFormatStyle
 NSToICUFormatStyle (NSNumberFormatterStyle style)
@@ -252,22 +262,16 @@ ICUToNSRoundingMode (UNumberFormatRoundingMode mode)
 #define	UNUM_ZERO_DIGIT_SYMBOL	0
 
 #endif
-
-#define GS_NSNumberFormatter_IVARS \
-  NSUInteger	_behavior; \
-  BOOL		_genDecimal; \
-  NSUInteger	_style; \
-  NSLocale	*_locale; \
-  void		*_formatter; \
-  id		_symbols[MAX_SYMBOLS]; \
-  id		_textAttributes[MAX_TEXTATTRIBUTES]; \
-  int		_attributes[MAX_ATTRIBUTES]
  
 #define GSInternal              NSNumberFormatterInternal
 #include        "GSInternal.h"
 GS_PRIVATE_INTERNAL(NSNumberFormatter)
 
+#ifdef GS_NONFRAGILE
+@interface NSNumberFormatter (Internal)
+#else
 @interface	NSNumberFormatterInternal (Methods)
+#endif
 - (int32_t) attributeForKey: (int)key;
 - (NSString*) symbolForKey: (int)key;
 - (NSString*) textAttributeForKey: (int)key;
@@ -276,7 +280,11 @@ GS_PRIVATE_INTERNAL(NSNumberFormatter)
 - (void) setTextAttribute: (NSString*)value forKey: (int)key;
 @end
 
+#ifdef GS_NONFRAGILE
+@implementation NSNumberFormatter (Internal)
+#else
 @implementation	NSNumberFormatterInternal (Methods)
+#endif
 
 - (int32_t) attributeForKey: (int)key
 {

Source/NSRegularExpression.m

@@ -22,6 +22,8 @@
    $Date: 2010-09-18 16:09:58 +0100 (Sat, 18 Sep 2010) $ $Revision: 31371 $
    */
 
+
+#define	EXPOSE_NSRegularExpression_IVARS	1
 #import "common.h"
 
 #if GS_USE_ICU == 1