ObjFW  Check-in [1f1ef23b3f]

Overview
Comment:Revert 3758bd8

This broke array / dictionary / number literals.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 1f1ef23b3f76478216093fe262069b9cb5c4e446312238e7c3a31c87ca9ba6ee
User & Date: js on 2014-06-20 10:52:05
Other Links: manifest | tags
Context
2014-06-21
21:43
Move all macros from OFObject.h to macros.h check-in: 13ee56edf3 user: js tags: trunk
2014-06-20
10:52
Revert 3758bd8 check-in: 1f1ef23b3f user: js tags: trunk
2014-06-18
13:12
Update Unicode to 7.0 check-in: 23ac92f416 user: js tags: trunk
Changes

Modified src/OFArray.h from [2851f0d1d5] to [d5cdb0d7ce].

440
441
442
443
444
445
446
447
448
   mutationsPtr: (unsigned long*)mutationsPtr;
@end

#import "OFMutableArray.h"

#ifndef NSINTEGER_DEFINED
/* Required for array literals to work */
# define NSArray OFArray
#endif







|

440
441
442
443
444
445
446
447
448
   mutationsPtr: (unsigned long*)mutationsPtr;
@end

#import "OFMutableArray.h"

#ifndef NSINTEGER_DEFINED
/* Required for array literals to work */
@compatibility_alias NSArray OFArray;
#endif

Modified src/OFDictionary.h from [22fec78e10] to [572c030e5b].

244
245
246
247
248
249
250
251
252
#endif
@end

#import "OFMutableDictionary.h"

#ifndef NSINTEGER_DEFINED
/* Required for dictionary literals to work */
# define NSDictionary OFDictionary
#endif







|

244
245
246
247
248
249
250
251
252
#endif
@end

#import "OFMutableDictionary.h"

#ifndef NSINTEGER_DEFINED
/* Required for dictionary literals to work */
@compatibility_alias NSDictionary OFDictionary;
#endif

Modified src/OFNumber.h from [05b1f19d45] to [ba305281bd].

910
911
912
913
914
915
916
917
918
 * @return The remainder of a division by the specified number
 */
- (OFNumber*)remainderOfDivisionWithNumber: (OFNumber*)num;
@end

#ifndef NSINTEGER_DEFINED
/* Required for number literals to work */
# define NSNumber OFNumber
#endif







|

910
911
912
913
914
915
916
917
918
 * @return The remainder of a division by the specified number
 */
- (OFNumber*)remainderOfDivisionWithNumber: (OFNumber*)num;
@end

#ifndef NSINTEGER_DEFINED
/* Required for number literals to work */
@compatibility_alias NSNumber OFNumber;
#endif

Modified src/OFString.h from [cf35fc260b] to [ce5de11866].

1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
#import "OFString+Serialization.h"
#import "OFString+URLEncoding.h"
#import "OFString+XMLEscaping.h"
#import "OFString+XMLUnescaping.h"

#ifndef NSINTEGER_DEFINED
/* Required for string boxing literals to work */
# define NSString OFString
#endif

#ifdef __cplusplus
extern "C" {
#endif
extern size_t of_string_utf8_encode(of_unichar_t, char*);
extern size_t of_string_utf8_decode(const char*, size_t, of_unichar_t*);
extern size_t of_string_utf16_length(const of_char16_t*);
extern size_t of_string_utf32_length(const of_char32_t*);
#ifdef __cplusplus
}
#endif







|












1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
#import "OFString+Serialization.h"
#import "OFString+URLEncoding.h"
#import "OFString+XMLEscaping.h"
#import "OFString+XMLUnescaping.h"

#ifndef NSINTEGER_DEFINED
/* Required for string boxing literals to work */
@compatibility_alias NSString OFString;
#endif

#ifdef __cplusplus
extern "C" {
#endif
extern size_t of_string_utf8_encode(of_unichar_t, char*);
extern size_t of_string_utf8_decode(const char*, size_t, of_unichar_t*);
extern size_t of_string_utf16_length(const of_char16_t*);
extern size_t of_string_utf32_length(const of_char32_t*);
#ifdef __cplusplus
}
#endif