Overview
Comment: | Fix compiling for AmigaOS |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
171f3ba8310f6f09177e498a1247088e |
User & Date: | js on 2021-05-01 02:39:12 |
Other Links: | manifest | tags |
Context
2021-05-01
| ||
02:42 | OFFile: Add missing locking on AmigaOS check-in: d39e22d766 user: js tags: trunk | |
02:39 | Fix compiling for AmigaOS check-in: 171f3ba831 user: js tags: trunk | |
2021-04-30
| ||
21:23 | Make OFHashSeed private check-in: 39863b3503 user: js tags: trunk | |
Changes
Modified src/OFCondition.m from [48a8d9c9b2] to [17f7291bd2].
︙ | ︙ | |||
102 103 104 105 106 107 108 | return true; } #ifdef OF_AMIGAOS - (bool)waitForTimeInterval: (OFTimeInterval)timeInterval orExecSignal: (ULONG *)signalMask { | | | 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 | return true; } #ifdef OF_AMIGAOS - (bool)waitForTimeInterval: (OFTimeInterval)timeInterval orExecSignal: (ULONG *)signalMask { int error = OFPlainConditionTimedWaitOrExecSignal(&_condition, &_mutex, timeInterval, signalMask); if (error == ETIMEDOUT) return false; if (error != 0) @throw [OFConditionWaitFailedException |
︙ | ︙ |
Modified src/OFFile.m from [e28a8564db] to [783bfdb488].
︙ | ︙ | |||
75 76 77 78 79 80 81 | #ifndef O_EXLOCK # define O_EXLOCK 0 #endif #ifndef OF_AMIGAOS # define closeHandle(h) close(h) #else | | | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | #ifndef O_EXLOCK # define O_EXLOCK 0 #endif #ifndef OF_AMIGAOS # define closeHandle(h) close(h) #else static struct _OFFileHandle { struct _OFFileHandle *previous, *next; BPTR handle; bool append; } *firstHandle = NULL; static void closeHandle(OFFileHandle handle) |
︙ | ︙ |
Modified src/OFLocale.m from [54708bc402] to [947d4e8829].
︙ | ︙ | |||
422 423 424 425 426 427 428 | if (GetVar("Charset", buffer, sizeof(buffer), 0) > 0) { # else if (0) { # endif OFStringEncoding ASCII = OFStringEncodingASCII; @try { | | | 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 | if (GetVar("Charset", buffer, sizeof(buffer), 0) > 0) { # else if (0) { # endif OFStringEncoding ASCII = OFStringEncodingASCII; @try { _encoding = OFStringEncodingParseName( [OFString stringWithCString: buffer encoding: ASCII]); } @catch (OFInvalidArgumentException *e) { _encoding = OFStringEncodingISO8859_1; } } else _encoding = OFStringEncodingISO8859_1; |
︙ | ︙ |
Modified src/OFPlainThread.h from [8049a183fa] to [00cdbb5121].
︙ | ︙ | |||
71 72 73 74 75 76 77 | static OF_INLINE bool OFPlainThreadIsCurrent(OFPlainThread thread) { return (thread == GetCurrentThread()); } #elif defined(OF_AMIGAOS) extern OFPlainThread OFCurrentPlainThread(void); | < < | < < < | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | static OF_INLINE bool OFPlainThreadIsCurrent(OFPlainThread thread) { return (thread == GetCurrentThread()); } #elif defined(OF_AMIGAOS) extern OFPlainThread OFCurrentPlainThread(void); extern bool OFPlainThreadIsCurrent(OFPlainThread); #endif #ifdef __cplusplus extern "C" { #endif extern int OFPlainThreadAttributesInit(OFPlainThreadAttributes *attr); extern int OFPlainThreadNew(OFPlainThread *thread, const char *name, |
︙ | ︙ |
Modified src/macros.h from [22f8070f90] to [13da37c718].
︙ | ︙ | |||
605 606 607 608 609 610 611 | # define OFToLittleEndian64(i) (i) #endif #ifdef OF_FLOAT_BIG_ENDIAN # define OFFromBigEndianFloat(f) (f) # define OFFromBigEndianDouble(d) (d) # define OFFromLittleEndianFloat(f) OFByteSwapFloat(f) | | | | 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 | # define OFToLittleEndian64(i) (i) #endif #ifdef OF_FLOAT_BIG_ENDIAN # define OFFromBigEndianFloat(f) (f) # define OFFromBigEndianDouble(d) (d) # define OFFromLittleEndianFloat(f) OFByteSwapFloat(f) # define OFFromLittleEndianDouble(d) OFByteSwapDouble(d) # define OFToBigEndianFloat(f) (f) # define OFToBigEndianDouble(d) (d) # define OFToLittleEndianFloat(f) OFByteSwapFloat(f) # define OFToLittleEndianDouble(d) OFByteSwapDouble(d) #else # define OFFromBigEndianFloat(f) OFByteSwapFloat(f) # define OFFromBigEndianDouble(d) OFByteSwapDouble(d) # define OFFromLittleEndianFloat(f) (f) # define OFFromLittleEndianDouble(d) (d) # define OFToBigEndianFloat(f) OFByteSwapFloat(f) # define OFToBigEndianDouble(d) OFByteSwapDouble(d) |
︙ | ︙ |
Modified src/platform/amiga/OFPlainThread.m from [d05f96868a] to [874b38ae30].
︙ | ︙ | |||
155 156 157 158 159 160 161 162 163 164 165 166 167 168 | } OFPlainThread OFCurrentPlainThread(void) { return OFTLSKeyGet(threadKey); } int OFPlainThreadJoin(OFPlainThread thread) { ObtainSemaphore(&thread->semaphore); if (thread->done) { | > > > > > > | 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 | } OFPlainThread OFCurrentPlainThread(void) { return OFTLSKeyGet(threadKey); } bool OFPlainThreadIsCurrent(OFPlainThread thread) { return (thread->task == FindTask(NULL)); } int OFPlainThreadJoin(OFPlainThread thread) { ObtainSemaphore(&thread->semaphore); if (thread->done) { |
︙ | ︙ |