ObjFW  Check-in [b31bd48f90]

Overview
Comment:Remove #define INTUITION_CLASSES_H hack

This has been fixed upstream in amiga-gcc.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: b31bd48f908e2adbb6b82d70706d33501f505093fed5975ff3bf520db2c84474
User & Date: js on 2018-05-26 14:49:26
Other Links: manifest | tags
Context
2018-05-26
15:18
runtime/linklib: Use init/exit list on amiga-gcc check-in: 57f0d10b19 user: js tags: trunk
14:49
Remove #define INTUITION_CLASSES_H hack check-in: b31bd48f90 user: js tags: trunk
14:46
Use trunc() instead of floor() in several places check-in: 3c20dd5f95 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Show Whitespace Changes Patch

Modified src/OFApplication.m from [d91a949b73] to [54110d91f4].

︙︙
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65

#import "OFOutOfRangeException.h"
#import "OFSandboxActivationFailedException.h"

#if defined(OF_MACOS)
# include <crt_externs.h>
#elif defined(OF_WINDOWS)
# include <windows.h>

extern int _CRT_glob;
extern void __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *);
#elif defined(OF_AMIGAOS)
# ifdef OF_AMIGAOS_M68K
#  define INTUITION_CLASSES_H
# endif
# include <proto/exec.h>
# include <proto/dos.h>
#elif !defined(OF_IOS)
extern char **environ;
#endif

#ifdef OF_PSP








<



<
<
<








45
46
47
48
49
50
51

52
53
54



55
56
57
58
59
60
61

#import "OFOutOfRangeException.h"
#import "OFSandboxActivationFailedException.h"

#if defined(OF_MACOS)
# include <crt_externs.h>
#elif defined(OF_WINDOWS)
# include <windows.h>

extern int _CRT_glob;
extern void __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *);
#elif defined(OF_AMIGAOS)



# include <proto/exec.h>
# include <proto/dos.h>
#elif !defined(OF_IOS)
extern char **environ;
#endif

#ifdef OF_PSP
︙︙

Modified src/OFFile.m from [994cdd90a3] to [9880062333].

︙︙
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70


#ifdef OF_NINTENDO_DS
# include <stdbool.h>
# include <filesystem.h>
#endif

#ifdef OF_AMIGAOS
# ifdef OF_AMIGAOS_M68K
#  define INTUITION_CLASSES_H
# endif
# include <proto/dos.h>
#endif

#ifndef O_BINARY
# define O_BINARY 0
#endif
#ifndef O_CLOEXEC








<
<
<








54
55
56
57
58
59
60



61
62
63
64
65
66
67


#ifdef OF_NINTENDO_DS
# include <stdbool.h>
# include <filesystem.h>
#endif

#ifdef OF_AMIGAOS



# include <proto/dos.h>
#endif

#ifndef O_BINARY
# define O_BINARY 0
#endif
#ifndef O_CLOEXEC
︙︙

Modified src/OFFileManager.m from [bdbcbaf8ab] to [bcca1cec46].

︙︙
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70

#ifdef OF_WINDOWS
# include <windows.h>
# include <direct.h>
# include <ntdef.h>
#endif

#ifdef OF_AMIGAOS
# ifdef OF_AMIGAOS_M68K
#  define INTUITION_CLASSES_H
# endif
# include <proto/exec.h>
# include <proto/dos.h>
# include <proto/locale.h>
#endif

@interface OFFileManager_default: OFFileManager
@end








<
<
<








54
55
56
57
58
59
60



61
62
63
64
65
66
67

#ifdef OF_WINDOWS
# include <windows.h>
# include <direct.h>
# include <ntdef.h>
#endif

#ifdef OF_AMIGAOS



# include <proto/exec.h>
# include <proto/dos.h>
# include <proto/locale.h>
#endif

@interface OFFileManager_default: OFFileManager
@end
︙︙

Modified src/OFLocalization.m from [d4d11c9c0c] to [ec48586c81].

︙︙
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47


#ifdef OF_AMIGAOS
# ifdef OF_AMIGAOS4
#  define __NOLIBBASE__
#  define __NOGLOBALIFACE__
#  define __USE_INLINE__
# endif
# ifdef OF_AMIGAOS_M68K
#  define INTUITION_CLASSES_H
# endif
# include <proto/dos.h>
# include <proto/exec.h>
# include <proto/locale.h>
#endif

static OFLocalization *sharedLocalization = nil;









<
<
<








31
32
33
34
35
36
37



38
39
40
41
42
43
44


#ifdef OF_AMIGAOS
# ifdef OF_AMIGAOS4
#  define __NOLIBBASE__
#  define __NOGLOBALIFACE__
#  define __USE_INLINE__
# endif



# include <proto/dos.h>
# include <proto/exec.h>
# include <proto/locale.h>
#endif

static OFLocalization *sharedLocalization = nil;
︙︙

Modified src/OFStdIOStream.h from [62b2bfde7a] to [71e9d3c2a0].

︙︙
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35

 * file.
 */

#import "OFStream.h"
#import "OFKernelEventObserver.h"

#ifdef OF_AMIGAOS
# ifdef OF_AMIGAOS_M68K
#  define INTUITION_CLASSES_H
# endif
# include <proto/dos.h>
# ifdef OF_AMIGAOS_M68K
#  undef INTUITION_CLASSES_H
# endif
#endif

OF_ASSUME_NONNULL_BEGIN

/*!
 * @class OFStdIOStream OFStdIOStream.h ObjFW/OFStdIOStream.h
 *








<
<
<

<
<
<








15
16
17
18
19
20
21



22



23
24
25
26
27
28
29

 * file.
 */

#import "OFStream.h"
#import "OFKernelEventObserver.h"

#ifdef OF_AMIGAOS



# include <proto/dos.h>



#endif

OF_ASSUME_NONNULL_BEGIN

/*!
 * @class OFStdIOStream OFStdIOStream.h ObjFW/OFStdIOStream.h
 *
︙︙

Modified src/OFStdIOStream.m from [3ca31d2e74] to [5e211fc7f6].

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


#import "OFNotOpenException.h"
#import "OFOutOfRangeException.h"
#import "OFReadFailedException.h"
#import "OFWriteFailedException.h"

#ifdef OF_AMIGAOS
# ifdef OF_AMIGAOS_M68K
#  define INTUITION_CLASSES_H
# endif
# include <proto/exec.h>
#endif

/* References for static linking */
#ifdef OF_WINDOWS
void
_reference_to_OFStdIOStream_Win32Console(void)








<
<
<








38
39
40
41
42
43
44



45
46
47
48
49
50
51


#import "OFNotOpenException.h"
#import "OFOutOfRangeException.h"
#import "OFReadFailedException.h"
#import "OFWriteFailedException.h"

#ifdef OF_AMIGAOS



# include <proto/exec.h>
#endif

/* References for static linking */
#ifdef OF_WINDOWS
void
_reference_to_OFStdIOStream_Win32Console(void)
︙︙

Modified src/OFThread.m from [a7a9564a2b] to [5bd8a09d91].

︙︙
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45

# include <sched.h>
#endif
#include "unistd_wrapper.h"

#include "platform.h"

#ifdef OF_AMIGAOS
# ifdef OF_AMIGAOS_M68K
#  define INTUITION_CLASSES_H
# endif
# include <proto/dos.h>
#endif

#ifdef OF_WII
# define nanosleep ogc_nanosleep
# include <ogcsys.h>
# undef nanosleep








<
<
<








29
30
31
32
33
34
35



36
37
38
39
40
41
42

# include <sched.h>
#endif
#include "unistd_wrapper.h"

#include "platform.h"

#ifdef OF_AMIGAOS



# include <proto/dos.h>
#endif

#ifdef OF_WII
# define nanosleep ogc_nanosleep
# include <ogcsys.h>
# undef nanosleep
︙︙

Modified src/OFURLHandler_file.m from [63f397cc49] to [78d1e3fb39].

︙︙
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79

#ifdef OF_WINDOWS
# include <windows.h>
# include <direct.h>
# include <ntdef.h>
#endif

#ifdef OF_AMIGAOS
# ifdef OF_AMIGAOS_M68K
#  define INTUITION_CLASSES_H
# endif
# include <proto/dos.h>
# include <proto/locale.h>
#endif

#if defined(OF_WINDOWS)
typedef struct __stat64 of_stat_t;
#elif defined(OF_AMIGAOS)








<
<
<








63
64
65
66
67
68
69



70
71
72
73
74
75
76

#ifdef OF_WINDOWS
# include <windows.h>
# include <direct.h>
# include <ntdef.h>
#endif

#ifdef OF_AMIGAOS



# include <proto/dos.h>
# include <proto/locale.h>
#endif

#if defined(OF_WINDOWS)
typedef struct __stat64 of_stat_t;
#elif defined(OF_AMIGAOS)
︙︙

Modified src/runtime/amiga-library.m from [52c1c18633] to [cbe13c4c89].

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

 */

#include "config.h"

#import "ObjFW_RT.h"
#import "private.h"

#ifdef OF_AMIGAOS_M68K
# define INTUITION_CLASSES_H
#endif

#include <exec/libraries.h>
#include <exec/nodes.h>
#include <exec/resident.h>
#include <proto/exec.h>

#define CONCAT_VERSION2(major, minor) #major "." #minor
#define CONCAT_VERSION(major, minor) CONCAT_VERSION2(major, minor)








<
<
<
<








16
17
18
19
20
21
22




23
24
25
26
27
28
29

 */

#include "config.h"

#import "ObjFW_RT.h"
#import "private.h"





#include <exec/libraries.h>
#include <exec/nodes.h>
#include <exec/resident.h>
#include <proto/exec.h>

#define CONCAT_VERSION2(major, minor) #major "." #minor
#define CONCAT_VERSION(major, minor) CONCAT_VERSION2(major, minor)
︙︙

Modified src/runtime/linklib/linklib.m from [7206ddd280] to [127b4c9eeb].

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


#include "config.h"

#import "ObjFW_RT.h"
#import "private.h"
#import "macros.h"

#ifdef OF_AMIGAOS_M68K
# define INTUITION_CLASSES_H
#endif
#include <proto/exec.h>

#import "inline.h"

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









<
<
<








17
18
19
20
21
22
23



24
25
26
27
28
29
30


#include "config.h"

#import "ObjFW_RT.h"
#import "private.h"
#import "macros.h"




#include <proto/exec.h>

#import "inline.h"

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

Fossil 2.23 [47362306a7] 2023-11-01 18:56:47
This page was generated in about 0.03s