Changes In Branch amiga-library Through [f8f3bc1545] Excluding Merge-Ins
This is equivalent to a diff from 2dd5d682eb to f8f3bc1545
2020-06-24
| ||
17:17 | ObjFW.h: Add missing imports check-in: 6f1f036339 user: js tags: trunk | |
2020-06-21
| ||
22:46 | Add missing of_log to linklib check-in: 08606a8804 user: js tags: amiga-library | |
22:26 | Adjust Amiga library to new of_{pbkdf2,scrypt} API check-in: f8f3bc1545 user: js tags: amiga-library | |
22:15 | Merge trunk into branch "amiga-library" check-in: 39641794dd user: js tags: amiga-library | |
22:12 | Makefile: Add docs target check-in: 2dd5d682eb user: js tags: trunk | |
22:08 | Move parameters for of_scrypt() to a struct check-in: 63f5276b33 user: js tags: trunk | |
Modified .fossil-settings/clean-glob from [02ac598dea] to [ae0763f577].
︙ | |||
23 24 25 26 27 28 29 30 31 32 33 34 35 36 | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | + | configure DerivedData docs extra.mk generators/gen_tables src/Info.plist src/bridge/Info.plist src/inline.h src/objfw-defs.h src/runtime/amiga-library-functable.inc src/runtime/inline.h tests/EBOOT.PBP tests/Info.plist tests/PARAM.SFO tests/objc_sync/objc_sync |
︙ |
Modified .fossil-settings/ignore-glob from [fea53f5b92] to [e019c86c67].
︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | + | configure DerivedData docs extra.mk generators/gen_tables src/Info.plist src/bridge/Info.plist src/inline.h src/objfw-defs.h src/runtime/amiga-library-functable.inc src/runtime/inline.h tests/EBOOT.PBP tests/Info.plist tests/PARAM.SFO tests/iOS.xcodeproj/*.pbxuser |
︙ |
Modified .gitignore from [79c7b883a0] to [d1c8b6c7eb].
︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | + | configure DerivedData docs extra.mk generators/gen_tables src/Info.plist src/bridge/Info.plist src/inline.h src/objfw-defs.h src/runtime/amiga-library-functable.inc src/runtime/inline.h tests/EBOOT.PBP tests/Info.plist tests/PARAM.SFO tests/iOS.xcodeproj/*.pbxuser |
︙ |
Modified buildsys.mk.in from [f618b547b0] to [4ea263de35].
︙ | |||
126 127 128 129 130 131 132 | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | - + | .SUFFIXES: .amigalib.o .beam .c .cc .class .cxx .d .erl .lib.o .java .mo .m .mm .o .plugin.o .po .py .pyc .rc .S .xpm .PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales copy-headers-into-framework ${SUBDIRS} ${SUBDIRS_AFTER} all: ${MAKE} -s pre-all ${MAKE} -s subdirs ${MAKE} -s depend |
︙ | |||
321 322 323 324 325 326 327 328 329 330 331 332 333 334 | 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | ${LINK_FAILED}; \ fi; \ for i in $$ars; do \ dir=".$$(echo $$i | sed 's/\//_/g').objs"; \ rm -fr $$dir; \ done; \ fi ${STATIC_AMIGA_LIB} ${STATIC_AMIGA_LIB_NOINST}: ${EXT_DEPS} ${AMIGA_LIB_OBJS} ${AMIGA_LIB_OBJS_EXTRA} ${LINK_STATUS} rm -f $@ out="$@"; \ objs=""; \ ars=""; \ for i in ${AMIGA_LIB_OBJS} ${AMIGA_LIB_OBJS_EXTRA}; do \ case $$i in \ *.a) \ ars="$$ars $$i" \ ;; \ *.o) \ objs="$$objs $$i" \ ;; \ esac \ done; \ for i in $$ars; do \ dir=".$$(echo $$i | sed 's/\//_/g').objs"; \ rm -fr $$dir; \ mkdir -p $$dir; \ cd $$dir; \ ${AR} x ../$$i; \ for j in *.o; do \ objs="$$objs $$dir/$$j"; \ done; \ cd ..; \ done; \ if ${AR} cr $@ $$objs && ${RANLIB} $@; then \ ${LINK_OK}; \ else \ rm -f $@; false; \ ${LINK_FAILED}; \ fi; \ for i in $$ars; do \ dir=".$$(echo $$i | sed 's/\//_/g').objs"; \ rm -fr $$dir; \ done locales: ${MO_FILES} .c.o: ${COMPILE_STATUS} in="$<"; \ out="$@"; \ |
︙ | |||
644 645 646 647 648 649 650 | 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 | - + | if ${MKDIR_P} ${DESTDIR}${amigalibdir} && ${INSTALL} -m 755 $$i ${DESTDIR}${amigalibdir}/$$i; then \ ${INSTALL_OK}; \ else \ ${INSTALL_FAILED}; \ fi \ done |
︙ | |||
750 751 752 753 754 755 756 | 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 | - + | ${DELETE_FAILED}; \ fi \ fi \ done rmdir ${DESTDIR}${prefix}/Library/Frameworks >/dev/null 2>&1 || true rmdir ${DESTDIR}${prefix}/Library >/dev/null 2>&1 || true |
︙ | |||
843 844 845 846 847 848 849 | 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 | - + | ${DIR_ENTER}; \ ${MAKE} -s clean || exit $$?; \ ${DIR_LEAVE}; \ done : >.deps |
︙ |
Modified configure.ac from [91f2d79380] to [5db7003e7d].
︙ | |||
51 52 53 54 55 56 57 58 59 60 61 62 63 | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | + - + - + | LDFLAGS="$LDFLAGS -noixemul" enable_files="yes" # Required for reading ENV: enable_shared="no" supports_amiga_lib="yes" AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(OBJFW_AMIGA_LIB, objfw68k.library) AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt68k.library) AC_SUBST(SFDC_TARGET, m68k-amigaos) AC_SUBST(SFD_FILE, amigaos3.sfd) AC_SUBST(SFDC_INLINE_H, inline.h) dnl For 68000, GCC emits calls to helper functions that dnl do not work properly in a library. |
︙ | |||
86 87 88 89 90 91 92 93 94 95 96 97 98 99 | 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | + | OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS -noixemul" LDFLAGS="$LDFLAGS -noixemul" enable_files="yes" # Required for reading ENV: supports_amiga_lib="yes" check_pedantic="no" # Breaks generated inlines AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(OBJFW_AMIGA_LIB, objfw.library) AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt.library) AC_SUBST(CVINCLUDE_INLINE_H, inline.h) t="-mresident32 -ffreestanding -noixemul" AC_SUBST(AMIGA_LIB_CFLAGS, $t) t="-mresident32 -nostartfiles -nodefaultlibs" t="$t -noixemul -lc" AC_SUBST(AMIGA_LIB_LDFLAGS, $t) |
︙ | |||
396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 | 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 | + + + + + + + + + + + + + + + + + + + | AC_SUBST(FORWARDING_A, "forwarding.a") AC_SUBST(FORWARDING_FORWARDING_A, "forwarding/forwarding.a") AC_SUBST(INVOCATION_A, "invocation.a") AC_SUBST(INVOCATION_INVOCATION_A, "invocation/invocation.a") AC_SUBST(LOOKUP_ASM_A, "lookup-asm.a") AC_SUBST(LOOKUP_ASM_LOOKUP_ASM_A, "lookup-asm/lookup-asm.a") ]) AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(EXCEPTIONS_AMIGALIB_A, "exceptions.amigalib.a") AC_SUBST(EXCEPTIONS_EXCEPTIONS_AMIGALIB_A, "exceptions/exceptions.amigalib.a") AC_SUBST(FORWARDING_AMIGALIB_A, "forwarding.amigalib.a") AC_SUBST(FORWARDING_FORWARDING_AMIGALIB_A, "forwarding/forwarding.amigalib.a") AC_SUBST(INVOCATION_AMIGALIB_A, "invocation.amigalib.a") AC_SUBST(INVOCATION_INVOCATION_AMIGALIB_A, "invocation/invocation.amigalib.a") AC_SUBST(LOOKUP_ASM_AMIGALIB_A, "lookup-asm.amigalib.a") AC_SUBST(LOOKUP_ASM_LOOKUP_ASM_AMIGALIB_A, "lookup-asm/lookup-asm.amigalib.a") ]) AC_DEFINE_UNQUOTED(PLUGIN_SUFFIX, "$PLUGIN_SUFFIX", [Suffix for plugins]) AS_IF([test x"$enable_files" != x"no" -a x"$PLUGIN_SUFFIX" != x""], [ AC_SUBST(USE_SRCS_PLUGINS, '${SRCS_PLUGINS}') AC_SUBST(TESTPLUGIN, "plugin") AC_DEFINE(OF_HAVE_PLUGINS, 1, [Whether we have plugin support]) AS_IF([test x"$build_framework" = x"yes"], [ TESTPLUGIN_LIBS="-F../../src -F../../src/runtime" TESTPLUGIN_LIBS="$TESTPLUGIN_LIBS -framework ObjFW" TESTPLUGIN_LIBS="$TESTPLUGIN_LIBS \${RUNTIME_FRAMEWORK_LIBS}" ], [ TESTPLUGIN_LIBS="-L../../src -L../../src/runtime" TESTPLUGIN_LIBS="$TESTPLUGIN_LIBS -lobjfw \${RUNTIME_LIBS}" ]) AC_SUBST(TESTPLUGIN_LIBS) ]) AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(LINKLIB, linklib) ]) AC_MSG_CHECKING(whether we need -D_GNU_SOURCE) AC_EGREP_CPP(egrep_cpp_yes, [ #include <stdlib.h> #if defined(__GLIBC__) || defined(__MINGW32__) || \ defined(__NEWLIB__) || defined(__MORPHOS__) |
︙ | |||
529 530 531 532 533 534 535 | 550 551 552 553 554 555 556 557 558 559 560 561 562 563 | - | AS_IF([test x"$build_framework" = x"yes"], [ AC_SUBST(OBJFWRT_FRAMEWORK, "ObjFWRT.framework") AC_SUBST(RUNTIME_FRAMEWORK_LIBS, "-framework ObjFWRT") ]) AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(RUNTIME_LIBS, "-lobjfwrt.library") |
︙ | |||
886 887 888 889 890 891 892 893 894 895 896 897 898 899 | 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 | + + + + + | AS_IF([test x"$enable_shared" != x"no"], [ AC_SUBST(ENCODINGS_LIB_A, "encodings.lib.a") AC_SUBST(ENCODINGS_ENCODINGS_LIB_A, "encodings/encodings.lib.a") ]) AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [ AC_SUBST(ENCODINGS_A, "encodings.a") AC_SUBST(ENCODINGS_ENCODINGS_A, "encodings/encodings.a") ]) AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(ENCODINGS_AMIGALIB_A, "encodings.amigalib.a") AC_SUBST(ENCODINGS_ENCODINGS_AMIGALIB_A, "encodings/encodings.amigalib.a") ]) ]) AC_CHECK_FUNC(arc4random, [ AC_DEFINE(OF_HAVE_ARC4RANDOM, 1, [Whether we have arc4random()]) ], [ AC_CHECK_FUNC(random, [ |
︙ |
Modified extra.mk.in from [fede1ccb17] to [45695f76f0].
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 | + | OBJFW_SHARED_LIB = @OBJFW_SHARED_LIB@ OBJFW_STATIC_LIB = @OBJFW_STATIC_LIB@ OBJFW_FRAMEWORK = @OBJFW_FRAMEWORK@ OBJFW_AMIGA_LIB = @OBJFW_AMIGA_LIB@ OBJFW_LIB_MAJOR = 9 OBJFW_LIB_MINOR = 1 OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR} OBJFWRT_SHARED_LIB = @OBJFWRT_SHARED_LIB@ OBJFWRT_STATIC_LIB = @OBJFWRT_STATIC_LIB@ OBJFWRT_FRAMEWORK = @OBJFWRT_FRAMEWORK@ |
︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | + + + + + + + + + + | AUTORELEASE_M = @AUTORELEASE_M@ BIN_PREFIX = @BIN_PREFIX@ BRIDGE = @BRIDGE@ CVINCLUDE_INLINE_H = @CVINCLUDE_INLINE_H@ ENCODINGS = @ENCODINGS@ ENCODINGS_A = @ENCODINGS_A@ ENCODINGS_AMIGALIB_A = @ENCODINGS_AMIGALIB_A@ ENCODINGS_ENCODINGS_A = @ENCODINGS_ENCODINGS_A@ ENCODINGS_ENCODINGS_AMIGALIB_A = @ENCODINGS_ENCODINGS_AMIGALIB_A@ ENCODINGS_ENCODINGS_LIB_A = @ENCODINGS_ENCODINGS_LIB_A@ ENCODINGS_LIB_A = @ENCODINGS_LIB_A@ ENCODINGS_SRCS = @ENCODINGS_SRCS@ EXCEPTIONS_A = @EXCEPTIONS_A@ EXCEPTIONS_AMIGALIB_A = @EXCEPTIONS_AMIGALIB_A@ EXCEPTIONS_EXCEPTIONS_A = @EXCEPTIONS_EXCEPTIONS_A@ EXCEPTIONS_EXCEPTIONS_AMIGALIB_A = @EXCEPTIONS_EXCEPTIONS_AMIGALIB_A@ EXCEPTIONS_EXCEPTIONS_LIB_A = @EXCEPTIONS_EXCEPTIONS_LIB_A@ EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@ FISH_COMPLETIONS = @FISH_COMPLETIONS@ FORWARDING_A = @FORWARDING_A@ FORWARDING_AMIGALIB_A = @FORWARDING_AMIGALIB_A@ FORWARDING_FORWARDING_A = @FORWARDING_FORWARDING_A@ FORWARDING_FORWARDING_AMIGALIB_A = @FORWARDING_FORWARDING_AMIGALIB_A@ FORWARDING_FORWARDING_LIB_A = @FORWARDING_FORWARDING_LIB_A@ FORWARDING_LIB_A = @FORWARDING_LIB_A@ INSTANCE_M = @INSTANCE_M@ INVOCATION_A = @INVOCATION_A@ INVOCATION_AMIGALIB_A = @INVOCATION_AMIGALIB_A@ INVOCATION_INVOCATION_A = @INVOCATION_INVOCATION_A@ INVOCATION_INVOCATION_AMIGALIB_A = @INVOCATION_INVOCATION_AMIGALIB_A@ INVOCATION_INVOCATION_LIB_A = @INVOCATION_INVOCATION_LIB_A@ INVOCATION_LIB_A = @INVOCATION_LIB_A@ LIBBASES_M = @LIBBASES_M@ LIBOBJFWRT_DEP = @LIBOBJFWRT_DEP@ LIBOBJFWRT_DEP_LVL2 = @LIBOBJFWRT_DEP_LVL2@ LIBOBJFW_DEP = @LIBOBJFW_DEP@ LIBOBJFW_DEP_LVL2 = @LIBOBJFW_DEP_LVL2@ LINKLIB = @LINKLIB@ LOOKUP_ASM_A = @LOOKUP_ASM_A@ LOOKUP_ASM_AMIGALIB_A = @LOOKUP_ASM_AMIGALIB_A@ LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LIB_A@ LOOKUP_ASM_LOOKUP_ASM_A = @LOOKUP_ASM_LOOKUP_ASM_A@ LOOKUP_ASM_LOOKUP_ASM_AMIGALIB_A = @LOOKUP_ASM_LOOKUP_ASM_AMIGALIB_A@ LOOKUP_ASM_LOOKUP_ASM_LIB_A = @LOOKUP_ASM_LOOKUP_ASM_LIB_A@ MAP_LDFLAGS = @MAP_LDFLAGS@ OFARC = @OFARC@ OFDNS = @OFDNS@ OFHASH = @OFHASH@ OFHTTP = @OFHTTP@ OFSOCK = @OFSOCK@ |
︙ |
Modified src/Makefile from [34c348d2c8] to [8464e86113].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | - + + + + + + + + + + | include ../extra.mk SUBDIRS = ${RUNTIME} exceptions ${ENCODINGS} forwarding invocation |
︙ | |||
234 235 236 237 238 239 240 241 242 243 | 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 | + + + + + + + + + + + + - + + + + + - + + | ${FORWARDING_FORWARDING_A} \ ${INVOCATION_INVOCATION_A} LIB_OBJS_EXTRA = ${RUNTIME_RUNTIME_LIB_A} \ ${EXCEPTIONS_EXCEPTIONS_LIB_A} \ ${ENCODINGS_ENCODINGS_LIB_A} \ ${FORWARDING_FORWARDING_LIB_A} \ ${INVOCATION_INVOCATION_LIB_A} AMIGA_LIB_OBJS_START = amiga-library.amigalib.o AMIGA_LIB_OBJS_EXTRA = amiga-glue.amigalib.o \ ${EXCEPTIONS_EXCEPTIONS_AMIGALIB_A} \ ${ENCODINGS_ENCODINGS_AMIGALIB_A} \ ${FORWARDING_FORWARDING_AMIGALIB_A} \ ${INVOCATION_INVOCATION_AMIGALIB_A} \ amiga-end.amigalib.o include ../buildsys.mk ${OBJFW_AMIGA_LIB}: inline.h ${SFDC_INLINE_H}: ${SFD_FILE} sfdc -q --target=${SFDC_TARGET} --mode=macros -o $@ $<; \ |
Modified src/OFFileManager.m from [c5306f3b5d] to [4ed45d9cf1].
︙ | |||
69 70 71 72 73 74 75 | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 | - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - | # include <proto/exec.h> # include <proto/dos.h> #endif @interface OFDefaultFileManager: OFFileManager @end |
︙ |
Added src/OFFileManager_constants.m version [bdcd5c9b25].
|
Modified src/OFObject.h from [0775955f65] to [b43176a606].
︙ | |||
1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 | 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 | + + + + + | #ifdef OF_APPLE_RUNTIME extern void *_Null_unspecified objc_autoreleasePoolPush(void); extern void objc_autoreleasePoolPop(void *_Null_unspecified pool); #endif extern id of_alloc_object(Class class_, size_t extraSize, size_t extraAlignment, void *_Nullable *_Nullable extra); extern void OF_NO_RETURN_FUNC of_method_not_found(id self, SEL _cmd); #ifndef OF_AMIGAOS extern uint32_t of_hash_seed; #else extern uint32_t *_Nonnull of_hash_seed_ref(void); # define of_hash_seed (*of_hash_seed_ref()) #endif #ifdef __cplusplus } #endif OF_ASSUME_NONNULL_END #ifdef __OBJC__ # import "OFObject+KeyValueCoding.h" # import "OFObject+Serialization.h" #endif #endif |
Modified src/OFObject.m from [d6b3535b02] to [99d327411f].
︙ | |||
97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 | + + + + + + + + + + + + | #define PRE_MEM_ALIGN ((sizeof(struct pre_mem) + \ (OF_BIGGEST_ALIGNMENT - 1)) & ~(OF_BIGGEST_ALIGNMENT - 1)) #define PRE_MEM(mem) ((struct pre_mem *)(void *)((char *)mem - PRE_MEM_ALIGN)) static struct { Class isa; } allocFailedException; #ifdef OF_AMIGAOS # undef of_hash_seed #endif uint32_t of_hash_seed; #ifdef OF_AMIGAOS uint32_t * of_hash_seed_ref(void) { return &of_hash_seed; } #endif static const char * typeEncodingForSelector(Class class, SEL selector) { Method method; if ((method = class_getInstanceMethod(class, selector)) == NULL) |
︙ |
Modified src/OFRunLoop.m from [1ed99b4d7a] to [bc1499b7d8].
︙ | |||
41 42 43 44 45 46 47 | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | - + | #import "OFSortedList.h" #import "OFTimer.h" #import "OFTimer+Private.h" #import "OFDate.h" #import "OFObserveFailedException.h" |
︙ |
Added src/OFRunLoop_constants.m version [bfd83a93ff].
|
Modified src/OFStdIOStream.h from [4b738f8353] to [30b6ddea45].
︙ | |||
132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | + + + + + + + + + - + + + + + + + + + | @end #ifdef __cplusplus extern "C" { #endif /*! @file */ #ifndef OF_AMIGAOS /*! * @brief The standard input as an OFStream. */ extern OFStdIOStream *_Nullable of_stdin; /*! * @brief The standard output as an OFStream. */ extern OFStdIOStream *_Nullable of_stdout; /*! * @brief The standard error as an OFStream. */ extern OFStdIOStream *_Nullable of_stderr; #else extern OFStdIOStream *_Nonnull *_Nullable of_stdin_ref(void); extern OFStdIOStream *_Nonnull *_Nullable of_stdout_ref(void); extern OFStdIOStream *_Nonnull *_Nullable of_stderr_ref(void); # define of_stdin (*of_stdin_ref()) # define of_stdout (*of_stdout_ref()) # define of_stderr (*of_stderr_ref()) #endif /*! |
Modified src/OFStdIOStream.m from [26a72da19c] to [acfa5ef390].
︙ | |||
53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - | #ifdef OF_WINDOWS void _reference_to_OFWin32ConsoleStdIOStream(void) { [OFWin32ConsoleStdIOStream class]; } #endif #ifdef OF_AMIGAOS # undef of_stdin # undef of_stdout # undef of_stderr #endif OFStdIOStream *of_stdin = nil; OFStdIOStream *of_stdout = nil; OFStdIOStream *of_stderr = nil; #ifdef OF_AMIGAOS OFStdIOStream ** of_stdin_ref(void) { return &of_stdin; } OFStdIOStream ** of_stdout_ref(void) { return &of_stdout; } OFStdIOStream ** of_stderr_ref(void) { return &of_stderr; } #endif #ifdef OF_AMIGAOS OF_DESTRUCTOR() { [of_stdin dealloc]; [of_stdout dealloc]; [of_stderr dealloc]; } #endif void of_log(OFConstantString *format, ...) { va_list arguments; va_start(arguments, format); of_logv(format, arguments); va_end(arguments); } void of_logv(OFConstantString *format, va_list arguments) { void *pool = objc_autoreleasePoolPush(); OFDate *date; OFString *dateString, *me, *msg; |
︙ |
Added src/amiga-end.m version [0d112ca98e].
|
Added src/amiga-glue.m version [77817a66d6].