Fixes for C++. Bug report by Lubos Dolezel.

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

Headers/CoreFoundation/CFBase.h

@@ -14,7 +14,7 @@
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
@@ -223,13 +223,12 @@ CFRangeMake(CFIndex location, CFIndex length)
 }
 
 /* Returned by comparison functions */
-typedef CFIndex CFComparisonResult;
-enum
+typedef enum
 {
     kCFCompareLessThan = -1,
     kCFCompareEqualTo = 0,
     kCFCompareGreaterThan = 1
-};
+} CFComparisonResult;
 
 /* Return when a value is not found */
 enum
@@ -331,7 +330,7 @@ typedef CFIndex     (*CFAllocatorPreferredSizeCallBack)(CFIndex size,
   CFOptionFlags hint, void *info);
 typedef const void* (*CFAllocatorRetainCallBack)(const void *info);
 typedef void        (*CFAllocatorReleaseCallBack)(const void *info);
-typedef CFStringRef	(*CFAllocatorCopyDescriptionCallBack)(const void *info);
+typedef CFStringRef        (*CFAllocatorCopyDescriptionCallBack)(const void *info);
 
 struct _CFAllocatorContext
 {
@@ -342,7 +341,7 @@ struct _CFAllocatorContext
   CFAllocatorCopyDescriptionCallBack copyDescription;
   CFAllocatorAllocateCallBack        allocate;
   CFAllocatorReallocateCallBack      reallocate;
-  CFAllocatorDeallocateCallBack	     deallocate;
+  CFAllocatorDeallocateCallBack             deallocate;
   CFAllocatorPreferredSizeCallBack   preferredSize;
 };
 typedef struct _CFAllocatorContext CFAllocatorContext;

Headers/CoreFoundation/CFCharacterSet.h

@@ -14,7 +14,7 @@
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
@@ -35,8 +35,7 @@ CF_EXTERN_C_BEGIN
 typedef const struct __CFCharacterSet * CFCharacterSetRef;
 typedef struct __CFCharacterSet * CFMutableCharacterSetRef;
 
-typedef CFIndex CFCharacterSetPredefinedSet;
-enum
+typedef enum
 {
   kCFCharacterSetControl = 1,
   kCFCharacterSetWhitespace,
@@ -59,7 +58,7 @@ enum
   kCFCharacterSetNewline = 15,
 #endif
   kCFCharacterSetIllegal = 12
-};
+} CFCharacterSetPredefinedSet;
 
 
 

Headers/CoreFoundation/CFDate.h

@@ -66,7 +66,7 @@ struct CFGregorianUnits
   double seconds;
 };
 
-enum CFGregorianUnitFlags
+typedef enum
 {
   kCFGregorianUnitsYears = (1 << 0),
   kCFGregorianUnitsMonths = (1 << 1),
@@ -75,8 +75,7 @@ enum CFGregorianUnitFlags
   kCFGregorianUnitsMinutes = (1 << 4),
   kCFGregorianUnitsSeconds = (1 << 5),
   kCFGregorianAllUnits = 0x00FFFFFF
-};
-typedef enum CFGregorianUnitFlags CFGregorianUnitFlags;
+} CFGregorianUnitFlags;
 
 CF_EXPORT const CFTimeInterval kCFAbsoluteTimeIntervalSince1970;
 CF_EXPORT const CFTimeInterval kCFAbsoluteTimeIntervalSince1904;

Headers/CoreFoundation/CFDateFormatter.h

@@ -14,7 +14,7 @@
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
@@ -37,15 +37,14 @@ CF_EXTERN_C_BEGIN
 
 typedef struct __CFDateFormatter *CFDateFormatterRef;
 
-typedef enum _CFDateFormatterStyle CFDateFormatterStyle;
-enum _CFDateFormatterStyle
+typedef enum _CFDateFormatterStyle
 {
   kCFDateFormatterNoStyle = 0,
   kCFDateFormatterShortStyle = 1,
   kCFDateFormatterMediumStyle = 2,
   kCFDateFormatterLongStyle = 3,
   kCFDateFormatterFullStyle = 4
-};
+} CFDateFormatterStyle;
 
 CF_EXPORT const CFStringRef kCFDateFormatterIsLenient; /* CFBoolean */
 CF_EXPORT const CFStringRef kCFDateFormatterTimeZone; /* CFTimeZone */

Headers/CoreFoundation/CFNumber.h

@@ -14,7 +14,7 @@
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
@@ -50,7 +50,7 @@ CF_EXPORT const CFNumberRef kCFNumberNaN;
 CF_EXPORT const CFNumberRef kCFNumberNegativeInfinity;
 CF_EXPORT const CFNumberRef kCFNumberPositiveInfinity;
 
-enum CFNumberType
+typedef enum
 {
   kCFNumberSInt8Type = 1,
   kCFNumberSInt16Type = 2,
@@ -73,8 +73,7 @@ enum CFNumberType
 #else
   kCFNumberMaxType = 14
 #endif
-};
-typedef enum CFNumberType CFNumberType;
+} CFNumberType;
 
 
 

Headers/CoreFoundation/CFNumberFormatter.h

@@ -14,7 +14,7 @@
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
@@ -62,8 +62,7 @@ enum
   kCFNumberFormatterPadAfterSuffix  = 3
 };
 
-typedef CFIndex CFNumberFormatterRoundingMode;
-enum
+typedef enum
 {
   kCFNumberFormatterRoundCeiling  = 0,
   kCFNumberFormatterRoundFloor    = 1,
@@ -72,98 +71,68 @@ enum
   kCFNumberFormatterRoundHalfEven = 4,
   kCFNumberFormatterRoundHalfDown = 5,
   kCFNumberFormatterRoundHalfUp   = 6
-};
+} CFNumberFormatterRoundingMode;
 
-typedef CFIndex CFNumberFormatterStyle;
-enum
+typedef enum
 {
   kCFNumberFormatterNoStyle         = 0,
   kCFNumberFormatterDecimalStyle    = 1,
   kCFNumberFormatterCurrencyStyle   = 2,
   kCFNumberFormatterPercentStyle    = 3,
   kCFNumberFormatterScientificStyle = 4,
   kCFNumberFormatterSpellOutStyle   = 5
-};
-
-CF_EXPORT const CFStringRef
-kCFNumberFormatterCurrencyCode; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterDecimalSeparator; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterCurrencyDecimalSeparator; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterAlwaysShowDecimalSeparator; /* CFBoolean */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterGroupingSeparator; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterUseGroupingSeparator; /* CFBoolean */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterPercentSymbol; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterZeroSymbol; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterNaNSymbol; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterInfinitySymbol; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterMinusSign; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterPlusSign; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterCurrencySymbol; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterExponentSymbol; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterMinIntegerDigits; /* CFNumber */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterMaxIntegerDigits; /* CFNumber */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterMinFractionDigits; /* CFNumber */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterMaxFractionDigits; /* CFNumber */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterGroupingSize; /* CFNumber */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterSecondaryGroupingSize; /* CFNumber */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterRoundingMode; /* CFNumber */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterRoundingIncrement; /* CFNumber */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterFormatWidth; /* CFNumber */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterPaddingPosition; /* CFNumber */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterPaddingCharacter; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterDefaultFormat; /* CFString */
+} CFNumberFormatterStyle;
+
+CF_EXPORT const CFStringRef kCFNumberFormatterCurrencyCode; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterDecimalSeparator; /* CFString */
+CF_EXPORT const CFStringRef
+  kCFNumberFormatterCurrencyDecimalSeparator; /* CFString */
+CF_EXPORT const CFStringRef
+  kCFNumberFormatterAlwaysShowDecimalSeparator; /* CFBoolean */
+CF_EXPORT const CFStringRef kCFNumberFormatterGroupingSeparator; /* CFString */
+CF_EXPORT const CFStringRef
+  kCFNumberFormatterUseGroupingSeparator; /* CFBoolean */
+CF_EXPORT const CFStringRef kCFNumberFormatterPercentSymbol; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterZeroSymbol; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterNaNSymbol; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterInfinitySymbol; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterMinusSign; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterPlusSign; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterCurrencySymbol; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterExponentSymbol; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterMinIntegerDigits; /* CFNumber */
+CF_EXPORT const CFStringRef kCFNumberFormatterMaxIntegerDigits; /* CFNumber */
+CF_EXPORT const CFStringRef kCFNumberFormatterMinFractionDigits; /* CFNumber */
+CF_EXPORT const CFStringRef kCFNumberFormatterMaxFractionDigits; /* CFNumber */
+CF_EXPORT const CFStringRef kCFNumberFormatterGroupingSize; /* CFNumber */
+CF_EXPORT const CFStringRef
+  kCFNumberFormatterSecondaryGroupingSize; /* CFNumber */
+CF_EXPORT const CFStringRef kCFNumberFormatterRoundingMode; /* CFNumber */
+CF_EXPORT const CFStringRef kCFNumberFormatterRoundingIncrement; /* CFNumber */
+CF_EXPORT const CFStringRef kCFNumberFormatterFormatWidth; /* CFNumber */
+CF_EXPORT const CFStringRef kCFNumberFormatterPaddingPosition; /* CFNumber */
+CF_EXPORT const CFStringRef kCFNumberFormatterPaddingCharacter; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterDefaultFormat; /* CFString */
 #if MAC_OS_X_VERSION_10_4 <= MAC_OS_X_VERSION_MAX_ALLOWED
-CF_EXPORT const CFStringRef
-kCFNumberFormatterMultiplier; /* CFNumber */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterPositivePrefix; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterPositiveSuffix; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterNegativePrefix; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterNegativeSuffix; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterPerMillSymbol; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterInternationalCurrencySymbol; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterMultiplier; /* CFNumber */
+CF_EXPORT const CFStringRef kCFNumberFormatterPositivePrefix; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterPositiveSuffix; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterNegativePrefix; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterNegativeSuffix; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterPerMillSymbol; /* CFString */
+CF_EXPORT const CFStringRef
+  kCFNumberFormatterInternationalCurrencySymbol; /* CFString */
 #endif
 #if MAC_OS_X_VERSION_10_5 <= MAC_OS_X_VERSION_MAX_ALLOWED 
 CF_EXPORT const CFStringRef
-kCFNumberFormatterCurrencyGroupingSeparator; /* CFString */
-CF_EXPORT const CFStringRef
-kCFNumberFormatterIsLenient; /* CFBoolean */
+  kCFNumberFormatterCurrencyGroupingSeparator; /* CFString */
+CF_EXPORT const CFStringRef kCFNumberFormatterIsLenient; /* CFBoolean */
 CF_EXPORT const CFStringRef
-kCFNumberFormatterUseSignificantDigits; /* CFBoolean */
+  kCFNumberFormatterUseSignificantDigits; /* CFBoolean */
 CF_EXPORT const CFStringRef
-kCFNumberFormatterMinSignificantDigits; /* CFNumber */
+  kCFNumberFormatterMinSignificantDigits; /* CFNumber */
 CF_EXPORT const CFStringRef
-kCFNumberFormatterMaxSignificantDigits; /* CFNumber */
+  kCFNumberFormatterMaxSignificantDigits; /* CFNumber */
 #endif
 
 

Headers/CoreFoundation/CFPropertyList.h

@@ -35,22 +35,20 @@
 CF_EXTERN_C_BEGIN
 
 #if MAC_OS_X_VERSION_10_2 <= MAC_OS_X_VERSION_MAX_ALLOWED
-typedef enum CFPropertyListFormat CFPropertyListFormat;
-enum CFPropertyListFormat
+typedef enum
 {
    kCFPropertyListOpenStepFormat = 1,
    kCFPropertyListXMLFormat_v1_0 = 100,
    kCFPropertyListBinaryFormat_v1_0 = 200
-};
+} CFPropertyListFormat;
 #endif
 
-typedef enum CFPropertyListMutabilityOptions CFPropertyListMutabilityOptions;
-enum CFPropertyListMutabilityOptions
+typedef enum
 {
    kCFPropertyListImmutable = 0,
    kCFPropertyListMutableContainers = 1,
    kCFPropertyListMutableContainersAndLeaves = 2
-};
+} CFPropertyListMutabilityOptions;
 
 #if MAC_OS_X_VERSION_10_6 <= MAC_OS_X_VERSION_MAX_ALLOWED
 enum

Headers/CoreFoundation/CFRunLoop.h

@@ -39,8 +39,7 @@ typedef struct __CFRunLoopSource * CFRunLoopSourceRef;
 typedef struct __CFRunLoopObserver * CFRunLoopObserverRef;
 typedef struct __CFRunLoopTimer * CFRunLoopTimerRef;
 
-typedef enum CFRunLoopActivity CFRunLoopActivity;
-enum CFRunLoopActivity
+typedef enum
 {
   kCFRunLoopEntry =         (1 << 0),
   kCFRunLoopBeforeTimers =  (1 << 1),
@@ -49,7 +48,7 @@ enum CFRunLoopActivity
   kCFRunLoopAfterWaiting =  (1 << 6),
   kCFRunLoopExit =          (1 << 7),
   kCFRunLoopAllActivities = 0x0FFFFFFFU
-};
+} CFRunLoopActivity;
 
 enum
 {

Headers/CoreFoundation/CFSocket.h

@@ -61,8 +61,7 @@ struct CFSocketSignature
   CFDataRef address;
 };
 
-typedef enum CFSocketCallBackType CFSocketCallBackType;
-enum CFSocketCallBackType
+typedef enum
 {
   kCFSocketNoCallBack =      0,
   kCFSocketReadCallBack =    1,
@@ -73,7 +72,7 @@ enum CFSocketCallBackType
   ,
   kCFSocketWriteCallBack =   8
 #endif
-};
+} CFSocketCallBackType;
 
 #if MAC_OS_X_VERSION_10_2 <= MAC_OS_X_VERSION_MAX_ALLOWED
 enum
@@ -89,13 +88,12 @@ enum
 };
 #endif
 
-typedef enum CFSocketError CFSocketError;
-enum CFSocketError
+typedef enum
 {
   kCFSocketSuccess =  0,
   kCFSocketError =   -1,
   kCFSocketTimeout = -2
-};
+} CFSocketError;
 
 typedef void (*CFSocketCallBack) (CFSocketRef s,
                                   CFSocketCallBackType callbackType,