ObjFW  Check-in [1664513cf6]

Overview
Comment:Change includes of objfw-rt.h to include local runtime.h.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | runtime
Files: files | file ages | folders
SHA3-256: 1664513cf6a83bfcb631ba58367988686cfdcb544f824e2d041312a73397a4a5
User & Date: js on 2012-03-04 19:28:25
Other Links: branch diff | manifest | tags
Context
2012-03-04
19:42
Remove all code for the GNU runtime. check-in: 7f0b0c9811 user: js tags: runtime
19:28
Change includes of objfw-rt.h to include local runtime.h. check-in: 1664513cf6 user: js tags: runtime
19:25
Don't check for the GNU runtime anymore. check-in: ff165576a6 user: js tags: runtime
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/OFBlock.m from [aca779a840] to [26addffed9].

︙︙
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105

	void *ivars, *methodlist, *dtable, *subclass_list, *sibling_class;
	void *protocols, *gc_object_type;
	long abi_version;
	void *ivar_offsets, *properties;
};

#ifndef OF_OBJFW_RUNTIME
/* ObjFW-RT already defines those */
enum objc_abi_class_info {
	OBJC_CLASS_INFO_CLASS	  = 0x01,
	OBJC_CLASS_INFO_METACLASS = 0x02
};
#endif

extern void __objc_exec_class(void*);








<








91
92
93
94
95
96
97

98
99
100
101
102
103
104

	void *ivars, *methodlist, *dtable, *subclass_list, *sibling_class;
	void *protocols, *gc_object_type;
	long abi_version;
	void *ivar_offsets, *properties;
};

#ifndef OF_OBJFW_RUNTIME

enum objc_abi_class_info {
	OBJC_CLASS_INFO_CLASS	  = 0x01,
	OBJC_CLASS_INFO_METACLASS = 0x02
};
#endif

extern void __objc_exec_class(void*);
︙︙

Modified src/OFObject.h from [131792314e] to [37e4450eb1].

︙︙
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

#endif

#include <stddef.h>
#include <stdint.h>
#include <limits.h>

#ifdef OF_OBJFW_RUNTIME
# import <objfw-rt.h>
#else
# import <objc/objc.h>
#endif

#define OF_RETAIN_COUNT_MAX UINT_MAX
#define OF_INVALID_INDEX SIZE_MAX









|








24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

#endif

#include <stddef.h>
#include <stdint.h>
#include <limits.h>

#ifdef OF_OBJFW_RUNTIME
# import "runtime.h"
#else
# import <objc/objc.h>
#endif

#define OF_RETAIN_COUNT_MAX UINT_MAX
#define OF_INVALID_INDEX SIZE_MAX
︙︙

Modified src/OFObject.m from [76ac8473f2] to [1328998492].

︙︙
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53

#import "OFOutOfRangeException.h"

#import "macros.h"

#if (defined(OF_APPLE_RUNTIME) && __OBJC2__) || defined(OF_GNU_RUNTIME)
# import <objc/objc-exception.h>
#elif defined(OF_OBJFW_RUNTIME)
# import <objfw-rt.h>
#elif defined(OF_OLD_GNU_RUNTIME)
# import <objc/Protocol.h>
#endif

#ifdef _WIN32
# include <windows.h>
#endif








|








39
40
41
42
43
44
45
46
47
48
49
50
51
52
53

#import "OFOutOfRangeException.h"

#import "macros.h"

#if (defined(OF_APPLE_RUNTIME) && __OBJC2__) || defined(OF_GNU_RUNTIME)
# import <objc/objc-exception.h>
#elif defined(OF_OBJFW_RUNTIME)
# import "runtime.h"
#elif defined(OF_OLD_GNU_RUNTIME)
# import <objc/Protocol.h>
#endif

#ifdef _WIN32
# include <windows.h>
#endif
︙︙

Modified src/base64.h from [1cfc5e7ce8] to [86d7b49ac9].

︙︙
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34

# define __STDC_LIMIT_MACROS
#endif
#ifndef __STDC_CONSTANT_MACROS
# define __STDC_CONSTANT_MACROS
#endif

#ifdef OF_OBJFW_RUNTIME
# import <objfw-rt.h>
#else
# import <objc/objc.h>
#endif

@class OFString;
@class OFDataArray;









|








20
21
22
23
24
25
26
27
28
29
30
31
32
33
34

# define __STDC_LIMIT_MACROS
#endif
#ifndef __STDC_CONSTANT_MACROS
# define __STDC_CONSTANT_MACROS
#endif

#ifdef OF_OBJFW_RUNTIME
# import "runtime.h"
#else
# import <objc/objc.h>
#endif

@class OFString;
@class OFDataArray;
︙︙

Modified src/objc_sync.m from [6d549f3b5e] to [1594a5423a].

︙︙
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33

#include <stdio.h>
#include <stdlib.h>
#include <assert.h>

#include <sys/types.h>

#ifdef OF_OBJFW_RUNTIME
# import <objfw-rt.h>
#else
# import <objc/objc.h>
#endif

#import "threading.h"

struct lock_s {








|








19
20
21
22
23
24
25
26
27
28
29
30
31
32
33

#include <stdio.h>
#include <stdlib.h>
#include <assert.h>

#include <sys/types.h>

#ifdef OF_OBJFW_RUNTIME
# import "runtime.h"
#else
# import <objc/objc.h>
#endif

#import "threading.h"

struct lock_s {
︙︙