summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Schleifer <js@heap.zone>2018-10-21 19:33:09 +0200
committerJonathan Schleifer <js@heap.zone>2018-10-21 19:33:09 +0200
commit50b1ae9b1ca6403680893a48e6191a110a59492d (patch)
tree1859236f0915c6e5362cea56f3786accaf2a2044
parentdcb0ec1c79c56017532aa5b3a71b8dbf337cbf58 (diff)
platform.h: Add Acorn RISC OS
-rw-r--r--src/OFGZIPStream.h30
-rw-r--r--src/OFZIPArchiveEntry.h4
-rw-r--r--src/OFZIPArchiveEntry.m4
-rw-r--r--src/platform.h6
4 files changed, 23 insertions, 21 deletions
diff --git a/src/OFGZIPStream.h b/src/OFGZIPStream.h
index 4084f054..910b4fa9 100644
--- a/src/OFGZIPStream.h
+++ b/src/OFGZIPStream.h
@@ -58,21 +58,21 @@ OF_ASSUME_NONNULL_BEGIN
} _flags;
uint8_t _extraFlags;
enum of_gzip_stream_os {
- OF_GZIP_STREAM_OS_FAT = 0,
- OF_GZIP_STREAM_OS_AMIGA = 1,
- OF_GZIP_STREAM_OS_VMS = 2,
- OF_GZIP_STREAM_OS_UNIX = 3,
- OF_GZIP_STREAM_OS_VM_CMS = 4,
- OF_GZIP_STREAM_OS_ATARI_TOS = 5,
- OF_GZIP_STREAM_OS_HPFS = 6,
- OF_GZIP_STREAM_OS_MACINTOSH = 7,
- OF_GZIP_STREAM_OS_Z_SYSTEM = 8,
- OF_GZIP_STREAM_OS_CP_M = 9,
- OF_GZIP_STREAM_OS_TOPS_20 = 10,
- OF_GZIP_STREAM_OS_NTFS = 11,
- OF_GZIP_STREAM_OS_QDOS = 12,
- OF_GZIP_STREAM_OS_ACORN_RISCOS = 13,
- OF_GZIP_STREAM_OS_UNKNOWN = 255
+ OF_GZIP_STREAM_OS_FAT = 0,
+ OF_GZIP_STREAM_OS_AMIGA = 1,
+ OF_GZIP_STREAM_OS_VMS = 2,
+ OF_GZIP_STREAM_OS_UNIX = 3,
+ OF_GZIP_STREAM_OS_VM_CMS = 4,
+ OF_GZIP_STREAM_OS_ATARI_TOS = 5,
+ OF_GZIP_STREAM_OS_HPFS = 6,
+ OF_GZIP_STREAM_OS_MACINTOSH = 7,
+ OF_GZIP_STREAM_OS_Z_SYSTEM = 8,
+ OF_GZIP_STREAM_OS_CP_M = 9,
+ OF_GZIP_STREAM_OS_TOPS_20 = 10,
+ OF_GZIP_STREAM_OS_NTFS = 11,
+ OF_GZIP_STREAM_OS_QDO = 12,
+ OF_GZIP_STREAM_OS_ACORN_RISC_OS = 13,
+ OF_GZIP_STREAM_OS_UNKNOWN = 255
} _OS;
size_t _bytesRead;
uint8_t _buffer[4];
diff --git a/src/OFZIPArchiveEntry.h b/src/OFZIPArchiveEntry.h
index 94730d02..1bc3034f 100644
--- a/src/OFZIPArchiveEntry.h
+++ b/src/OFZIPArchiveEntry.h
@@ -67,8 +67,8 @@ enum of_zip_archive_entry_attribute_compatibility {
OF_ZIP_ARCHIVE_ENTRY_ATTR_COMPAT_MVS = 11,
/*! VSE */
OF_ZIP_ARCHIVE_ENTRY_ATTR_COMPAT_VSE = 12,
- /*! Acorn Risc */
- OF_ZIP_ARCHIVE_ENTRY_ATTR_COMPAT_ACORN_RISC = 13,
+ /*! Acorn RISC OS */
+ OF_ZIP_ARCHIVE_ENTRY_ATTR_COMPAT_ACORN_RISC_OS = 13,
/*! VFAT */
OF_ZIP_ARCHIVE_ENTRY_ATTR_COMPAT_VFAT = 14,
/*! Alternate MVS */
diff --git a/src/OFZIPArchiveEntry.m b/src/OFZIPArchiveEntry.m
index bc4d18c1..f294edcb 100644
--- a/src/OFZIPArchiveEntry.m
+++ b/src/OFZIPArchiveEntry.m
@@ -76,8 +76,8 @@ of_zip_archive_entry_version_to_string(uint16_t version)
case OF_ZIP_ARCHIVE_ENTRY_ATTR_COMPAT_VSE:
attrCompat = "VSE";
break;
- case OF_ZIP_ARCHIVE_ENTRY_ATTR_COMPAT_ACORN_RISC:
- attrCompat = "Acorn Risc";
+ case OF_ZIP_ARCHIVE_ENTRY_ATTR_COMPAT_ACORN_RISC_OS:
+ attrCompat = "Acorn RISC OS";
break;
case OF_ZIP_ARCHIVE_ENTRY_ATTR_COMPAT_VFAT:
attrCompat = "VFAT";
diff --git a/src/platform.h b/src/platform.h
index fd8c7035..3c7604bf 100644
--- a/src/platform.h
+++ b/src/platform.h
@@ -91,9 +91,9 @@
# define OF_M68010
# endif
# if defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
-# define OF_RISCV64
+# define OF_RISC_V_64
# elif defined(__riscv)
-# define OF_RISCV
+# define OF_RISC_V
# endif
#endif
@@ -143,6 +143,8 @@
#elif defined(__DJGPP__)
# define OF_DJGPP
# define OF_MSDOS
+#elif defined(__riscos__)
+# define OF_ACORN_RISC_OS
#endif
#if defined(__ELF__)