Index: Doxyfile ================================================================== --- Doxyfile +++ Doxyfile @@ -4,10 +4,11 @@ FILE_PATTERNS = *.h *.m HTML_OUTPUT = . GENERATE_LATEX = NO HIDE_UNDOC_CLASSES = YES HIDE_UNDOC_MEMBERS = YES +TYPEDEF_HIDES_STRUCT = YES PREDEFINED = __OBJC__ \ DOXYGEN \ OF_BOXABLE \ OF_CONSUMED \ OF_DESIGNATED_INITIALIZER \ Index: src/OFArray.h ================================================================== --- src/OFArray.h +++ src/OFArray.h @@ -38,16 +38,22 @@ /** * @brief Options for joining the objects of an array. * * This is a bit mask. */ -typedef enum OFArrayJoinOptions { +typedef enum { /** Skip empty components */ OFArraySkipEmptyComponents = 1 } OFArrayJoinOptions; -typedef enum OFArraySortOptions { +/** + * @brief Options for sorting an array. + * + * This is a bit mask. + */ +typedef enum { + /** Sort the array descending */ OFArraySortDescending = 1 } OFArraySortOptions; #ifdef OF_HAVE_BLOCKS /** Index: src/OFDNSResolver.h ================================================================== --- src/OFDNSResolver.h +++ src/OFDNSResolver.h @@ -38,11 +38,11 @@ /** * @enum OFDNSResolverErrorCode OFDNSResolver.h ObjFW/OFDNSResolver.h * * @brief An enum describing why resolving a host failed. */ -typedef enum OFDNSResolverErrorCode { +typedef enum { /** An unknown error */ OFDNSResolverErrorCodeUnknown, /** The query timed out */ OFDNSResolverErrorCodeTimeout, /** The query was canceled */ Index: src/OFDNSResourceRecord.h ================================================================== --- src/OFDNSResourceRecord.h +++ src/OFDNSResourceRecord.h @@ -25,21 +25,21 @@ @class OFData; /** * @brief The DNS class. */ -typedef enum OFDNSClass { +typedef enum { /** IN */ OFDNSClassIN = 1, /** Any class. Only for queries. */ OFDNSClassAny = 255, } OFDNSClass; /** * @brief The type of a DNS resource record. */ -typedef enum OFDNSRecordType { +typedef enum { /** A */ OFDNSRecordTypeA = 1, /** NS */ OFDNSRecordTypeNS = 2, /** CNAME */ Index: src/OFData.h ================================================================== --- src/OFData.h +++ src/OFData.h @@ -27,11 +27,11 @@ /** * @brief Options for searching in data. * * This is a bit mask. */ -typedef enum OFDataSearchOptions { +typedef enum { /** Search backwards in the data */ OFDataSearchBackwards = 1 } OFDataSearchOptions; /** Index: src/OFFile.h ================================================================== --- src/OFFile.h +++ src/OFFile.h @@ -19,11 +19,11 @@ #ifndef OF_AMIGAOS # define OF_FILE_HANDLE_IS_FD typedef int OFFileHandle; static const OFFileHandle OFInvalidFileHandle = -1; #else -typedef struct OFFileHandle *OFFileHandle; +typedef struct _OFFileHandle *OFFileHandle; static const OFFileHandle OFInvalidFileHandle = NULL; #endif OF_ASSUME_NONNULL_BEGIN Index: src/OFFile.m ================================================================== --- src/OFFile.m +++ src/OFFile.m @@ -77,12 +77,12 @@ #endif #ifndef OF_AMIGAOS # define closeHandle(h) close(h) #else -static struct OFFileHandle - struct OFFileHandle *previous, *next; +static struct _OFFileHandle + struct _OFFileHandle *previous, *next; BPTR handle; bool append; } *firstHandle = NULL; static void Index: src/OFGZIPStream.h ================================================================== --- src/OFGZIPStream.h +++ src/OFGZIPStream.h @@ -21,11 +21,11 @@ OF_ASSUME_NONNULL_BEGIN /** * @brief The operating system on which compressed the data. */ -typedef enum OFGZIPStreamOperatingSystem { +typedef enum { OFGZIPStreamOperatingSystemFAT = 0, OFGZIPStreamOperatingSystemAmiga = 1, OFGZIPStreamOperatingSystemVMS = 2, OFGZIPStreamOperatingSystemUNIX = 3, OFGZIPStreamOperatingSystemVM_CMS = 4, Index: src/OFHTTPRequest.h ================================================================== --- src/OFHTTPRequest.h +++ src/OFHTTPRequest.h @@ -27,11 +27,11 @@ /** @file */ /** * @brief The type of an HTTP request. */ -typedef enum OFHTTPRequestMethod { +typedef enum { /** OPTIONS */ OFHTTPRequestMethodOptions, /** GET */ OFHTTPRequestMethodGet, /** HEAD */ @@ -51,17 +51,16 @@ /** * @struct OFHTTPRequestProtocolVersion OFHTTPRequest.h ObjFW/OFHTTPRequest.h * * @brief The HTTP version of the HTTP request. */ -struct OF_BOXABLE OFHTTPRequestProtocolVersion { +typedef struct OF_BOXABLE { /** The major of the HTTP version */ unsigned char major; /** The minor of the HTTP version */ unsigned char minor; -}; -typedef struct OFHTTPRequestProtocolVersion OFHTTPRequestProtocolVersion; +} OFHTTPRequestProtocolVersion; /** * @class OFHTTPRequest OFHTTPRequest.h ObjFW/OFHTTPRequest.h * * @brief A class for storing HTTP requests. Index: src/OFHuffmanTree.h ================================================================== --- src/OFHuffmanTree.h +++ src/OFHuffmanTree.h @@ -20,22 +20,22 @@ #import "OFInvalidFormatException.h" OF_ASSUME_NONNULL_BEGIN -typedef struct OFHuffmanTree { - struct OFHuffmanTree *_Nullable leaves[2]; +typedef struct _OFHuffmanTree { + struct _OFHuffmanTree *_Nullable leaves[2]; uint16_t value; -} OFHuffmanTree; +} *OFHuffmanTree; /* Inlined for performance. */ static OF_INLINE bool OFHuffmanTreeWalk(id _Nullable stream, bool (*bitReader)(id _Nullable, uint16_t *_Nonnull, uint8_t), - OFHuffmanTree *_Nonnull *_Nonnull tree, uint16_t *_Nonnull value) + OFHuffmanTree _Nonnull *_Nonnull tree, uint16_t *_Nonnull value) { - struct OFHuffmanTree *iter = *tree; + OFHuffmanTree iter = *tree; uint16_t bits; while (iter->value == 0xFFFF) { if OF_UNLIKELY (!bitReader(stream, &bits, 1)) { *tree = iter; @@ -53,14 +53,14 @@ } #ifdef __cplusplus extern "C" { #endif -extern OFHuffmanTree *_Nonnull OFHuffmanTreeNew(uint8_t lengths[_Nonnull], +extern OFHuffmanTree _Nonnull OFHuffmanTreeNew(uint8_t lengths[_Nonnull], uint16_t count); -extern OFHuffmanTree *_Nonnull OFHuffmanTreeNewSingle(uint16_t value); -extern void OFHuffmanTreeFree(OFHuffmanTree *_Nonnull tree); +extern OFHuffmanTree _Nonnull OFHuffmanTreeNewSingle(uint16_t value); +extern void OFHuffmanTreeFree(OFHuffmanTree _Nonnull tree); #ifdef __cplusplus } #endif OF_ASSUME_NONNULL_END Index: src/OFHuffmanTree.m ================================================================== --- src/OFHuffmanTree.m +++ src/OFHuffmanTree.m @@ -21,24 +21,24 @@ #import "OFHuffmanTree.h" #import "OFInvalidFormatException.h" #import "OFOutOfMemoryException.h" -static OFHuffmanTree * +static OFHuffmanTree newTree(void) { - OFHuffmanTree *tree; + OFHuffmanTree tree; tree = OFAllocMemory(1, sizeof(*tree)); tree->leaves[0] = tree->leaves[1] = NULL; tree->value = 0xFFFF; return tree; } static void -treeInsert(OFHuffmanTree *tree, uint16_t code, uint8_t length, uint16_t value) +treeInsert(OFHuffmanTree tree, uint16_t code, uint8_t length, uint16_t value) { while (length > 0) { uint8_t bit; length--; @@ -51,14 +51,14 @@ } tree->value = value; } -OFHuffmanTree * +OFHuffmanTree OFHuffmanTreeNew(uint8_t lengths[], uint16_t count) { - OFHuffmanTree *tree; + OFHuffmanTree tree; uint16_t *lengthCount = NULL; uint16_t code, maxCode = 0, *nextCode = NULL; uint_fast8_t maxBit = 0; @try { @@ -106,24 +106,24 @@ } return tree; } -OFHuffmanTree * +OFHuffmanTree OFHuffmanTreeNewSingle(uint16_t value) { - OFHuffmanTree *tree = newTree(); + OFHuffmanTree tree = newTree(); tree->value = value; return tree; } void -OFHuffmanTreeFree(OFHuffmanTree *tree) +OFHuffmanTreeFree(OFHuffmanTree tree) { for (uint_fast8_t i = 0; i < 2; i++) if OF_LIKELY (tree->leaves[i] != NULL) OFHuffmanTreeFree(tree->leaves[i]); OFFreeMemory(tree); } Index: src/OFInflate64Stream.h ================================================================== --- src/OFInflate64Stream.h +++ src/OFInflate64Stream.h @@ -49,23 +49,23 @@ } uncompressedHeader; struct { uint16_t position, length; } uncompressed; struct { - OFHuffmanTree *_Nullable litLenTree; - OFHuffmanTree *_Nullable distTree; - OFHuffmanTree *_Nullable codeLenTree; - OFHuffmanTree *_Nullable treeIter; + OFHuffmanTree _Nullable litLenTree; + OFHuffmanTree _Nullable distTree; + OFHuffmanTree _Nullable codeLenTree; + OFHuffmanTree _Nullable treeIter; uint8_t *_Nullable lengths; uint16_t receivedCount; uint8_t value, litLenCodesCount, distCodesCount; uint8_t codeLenCodesCount; } huffmanTree; struct { - OFHuffmanTree *_Nullable litLenTree; - OFHuffmanTree *_Nullable distTree; - OFHuffmanTree *_Nullable treeIter; + OFHuffmanTree _Nullable litLenTree; + OFHuffmanTree _Nullable distTree; + OFHuffmanTree _Nullable treeIter; int state; uint16_t value, length, distance, extraBits; } huffman; } _context; bool _inLastBlock, _atEndOfStream; Index: src/OFInflateStream.h ================================================================== --- src/OFInflateStream.h +++ src/OFInflateStream.h @@ -49,23 +49,23 @@ } uncompressedHeader; struct { uint16_t position, length; } uncompressed; struct { - OFHuffmanTree *_Nullable litLenTree; - OFHuffmanTree *_Nullable distTree; - OFHuffmanTree *_Nullable codeLenTree; - OFHuffmanTree *_Nullable treeIter; + OFHuffmanTree _Nullable litLenTree; + OFHuffmanTree _Nullable distTree; + OFHuffmanTree _Nullable codeLenTree; + OFHuffmanTree _Nullable treeIter; uint8_t *_Nullable lengths; uint16_t receivedCount; uint8_t value, litLenCodesCount, distCodesCount; uint8_t codeLenCodesCount; } huffmanTree; struct { - OFHuffmanTree *_Nullable litLenTree; - OFHuffmanTree *_Nullable distTree; - OFHuffmanTree *_Nullable treeIter; + OFHuffmanTree _Nullable litLenTree; + OFHuffmanTree _Nullable distTree; + OFHuffmanTree _Nullable treeIter; int state; uint16_t value, length, distance, extraBits; } huffman; } _context; bool _inLastBlock, _atEndOfStream; Index: src/OFInflateStream.m ================================================================== --- src/OFInflateStream.m +++ src/OFInflateStream.m @@ -97,11 +97,11 @@ }; #endif static const uint8_t codeLengthsOrder[19] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 }; -static OFHuffmanTree *fixedLitLenTree, *fixedDistTree; +static OFHuffmanTree fixedLitLenTree, fixedDistTree; @implementation OFInflateStream static OF_INLINE bool tryReadBits(OFInflateStream *stream, uint16_t *bits, uint8_t count) { Index: src/OFJSONRepresentation.h ================================================================== --- src/OFJSONRepresentation.h +++ src/OFJSONRepresentation.h @@ -20,11 +20,11 @@ OF_ASSUME_NONNULL_BEGIN /** * @brief Options to change the behavior when creating a JSON representation. */ -typedef enum OFJSONRepresentationOptions { +typedef enum { /** Optimize for readability */ OFJSONRepresentationOptionPretty = 0x01, /** Generate JSON5 */ OFJSONRepresentationOptionJSON5 = 0x02, OFJSONRepresentationOptionIsIdentifier = 0x10 Index: src/OFLHADecompressingStream.h ================================================================== --- src/OFLHADecompressingStream.h +++ src/OFLHADecompressingStream.h @@ -33,12 +33,14 @@ uint16_t _savedBits; unsigned char *_slidingWindow; uint32_t _slidingWindowIndex, _slidingWindowMask; int _state; uint16_t _symbolsLeft; - OFHuffmanTree *_Nullable _codeLenTree, *_Nullable _litLenTree; - OFHuffmanTree *_Nullable _distTree, *_Nullable _treeIter; + OFHuffmanTree _Nullable _codeLenTree; + OFHuffmanTree _Nullable _litLenTree; + OFHuffmanTree _Nullable _distTree; + OFHuffmanTree _Nullable _treeIter; uint16_t _codesCount, _codesReceived; bool _currentIsExtendedLength, _skip; uint8_t *_Nullable _codesLengths; uint16_t _length; uint32_t _distance; Index: src/OFList.h ================================================================== --- src/OFList.h +++ src/OFList.h @@ -21,17 +21,17 @@ OF_ASSUME_NONNULL_BEGIN /** @file */ /** - * @typedef OFListItem + * @struct OFListItem OFList.h ObjFW/OFList.h * * @brief A list item. * * See @ref OFListItemNext, @ref OFListItemPrevious and @ref OFListItemObject. */ -typedef struct OFListItem *OFListItem; +typedef struct _OFListItem *OFListItem; #ifdef __cplusplus extern "C" { #endif /*! Index: src/OFList.m ================================================================== --- src/OFList.m +++ src/OFList.m @@ -24,12 +24,12 @@ #import "OFArray.h" #import "OFEnumerationMutationException.h" #import "OFInvalidArgumentException.h" -struct OFListItem { - OFListItem previous, next; +struct _OFListItem { + struct _OFListItem *previous, *next; id object; }; OF_DIRECT_MEMBERS @interface OFListEnumerator: OFEnumerator Index: src/OFMapTable.h ================================================================== --- src/OFMapTable.h +++ src/OFMapTable.h @@ -23,22 +23,21 @@ /** * @struct OFMapTableFunctions OFMapTable.h ObjFW/OFMapTable.h * * @brief A struct describing the functions to be used by the map table. */ -struct OFMapTableFunctions { +typedef struct { /** The function to retain keys / objects */ void *_Nullable (*_Nullable retain)(void *_Nullable object); /** The function to release keys / objects */ void (*_Nullable release)(void *_Nullable object); /** The function to hash keys */ unsigned long (*_Nullable hash)(void *_Nullable object); /** The function to compare keys / objects */ bool (*_Nullable equal)(void *_Nullable object1, void *_Nullable object2); -}; -typedef struct OFMapTableFunctions OFMapTableFunctions; +} OFMapTableFunctions; #ifdef OF_HAVE_BLOCKS /** * @brief A block for enumerating an OFMapTable. * Index: src/OFObject.h ================================================================== --- src/OFObject.h +++ src/OFObject.h @@ -52,11 +52,11 @@ /** @file */ /** * @brief A result of a comparison. */ -typedef enum OFComparisonResult { +typedef enum { /** The left object is smaller than the right */ OFOrderedAscending = -1, /** Both objects are equal */ OFOrderedSame = 0, /** The left object is bigger than the right */ @@ -73,13 +73,13 @@ */ typedef OFComparisonResult (^OFComparator)(id _Nonnull left, id _Nonnull right); #endif /** - * @brief An enum for storing endianess. + * @brief An enum for representing endianess. */ -typedef enum OFByteOrder { +typedef enum { /** Most significant byte first (big endian) */ OFByteOrderBigEndian, /** Least significant byte first (little endian) */ OFByteOrderLittleEndian, /** Native byte order of the system */ @@ -93,17 +93,16 @@ /** * @struct OFRange OFObject.h ObjFW/OFObject.h * * @brief A range. */ -struct OF_BOXABLE OFRange { +typedef struct OF_BOXABLE { /** The start of the range */ size_t location; /** The length of the range */ size_t length; -}; -typedef struct OFRange OFRange; +} OFRange; /** * @brief Creates a new OFRange. * * @param start The starting index of the range @@ -145,17 +144,16 @@ /** * @struct OFPoint OFObject.h ObjFW/OFObject.h * * @brief A point. */ -struct OF_BOXABLE OFPoint { +typedef struct OF_BOXABLE { /** The x coordinate of the point */ float x; /** The y coordinate of the point */ float y; -}; -typedef struct OFPoint OFPoint; +} OFPoint; /** * @brief Creates a new OFPoint. * * @param x The x coordinate of the point @@ -192,17 +190,16 @@ /** * @struct OFSize OFObject.h ObjFW/OFObject.h * * @brief A size. */ -struct OF_BOXABLE OFSize { +typedef struct OF_BOXABLE { /** The width of the size */ float width; /** The height of the size */ float height; -}; -typedef struct OFSize OFSize; +} OFSize; /** * @brief Creates a new OFSize. * * @param width The width of the size @@ -239,17 +236,16 @@ /** * @struct OFRect OFObject.h ObjFW/OFObject.h * * @brief A rectangle. */ -struct OF_BOXABLE OFRect { +typedef struct OF_BOXABLE { /** The point from where the rectangle originates */ OFPoint origin; /** The size of the rectangle */ OFSize size; -}; -typedef struct OFRect OFRect; +} OFRect; /** * @brief Creates a new OFRect. * * @param x The x coordinate of the top left corner of the rectangle Index: src/OFOptionsParser.h ================================================================== --- src/OFOptionsParser.h +++ src/OFOptionsParser.h @@ -23,11 +23,11 @@ /** * @struct OFOptionsParserOption OFOptionsParser.h ObjFW/OFOptionsParser.h * * @brief An option which can be parsed by an @ref OFOptionsParser. */ -struct OFOptionsParserOption { +typedef struct { /** The short version (e.g. `-v`) of the option or `\0` for none. */ OFUnichar shortOption; /** * The long version (e.g. `--verbose`) of the option or `nil` for none. @@ -55,12 +55,11 @@ /** * An optional pointer to an `OFString *` that is set to the * argument specified for the option or `nil` for no argument. */ OFString *__autoreleasing _Nullable *_Nullable argumentPtr; -}; -typedef struct OFOptionsParserOption OFOptionsParserOption; +} OFOptionsParserOption; /** * @class OFOptionsParser OFOptionsParser.h ObjFW/OFOptionsParser.h * * @brief A class for parsing the program options specified on the command line. Index: src/OFPBKDF2.h ================================================================== --- src/OFPBKDF2.h +++ src/OFPBKDF2.h @@ -29,11 +29,11 @@ @class OFHMAC; /** * @brief The parameters for @ref OFPBKDF2. */ -typedef struct OFPBKDF2Parameters { +typedef struct { /** @brief The HMAC to use to derive a key. */ __unsafe_unretained OFHMAC *HMAC; /** @brief The number of iterations to perform. */ size_t iterations; /** @brief The salt to derive a key with. */ Index: src/OFPlainThread.h ================================================================== --- src/OFPlainThread.h +++ src/OFPlainThread.h @@ -42,11 +42,11 @@ unsigned char joinSigBit; bool detached, done; } *OFPlainThread; #endif -typedef struct OFPlainThreadAttributes { +typedef struct { float priority; size_t stackSize; } OFPlainThreadAttributes; #if defined(OF_HAVE_PTHREADS) Index: src/OFPlugin.h ================================================================== --- src/OFPlugin.h +++ src/OFPlugin.h @@ -19,19 +19,19 @@ #ifndef OF_WINDOWS # include typedef void *OFPluginHandle; -typedef enum OFDLOpenFlags { +typedef enum { OFDLOpenFlagLazy = RTLD_LAZY, OFDLOpenFlagNow = RTLD_NOW } OFDLOpenFlags; #else # include typedef HMODULE OFPluginHandle; -typedef enum OFDLOpenFlags { +typedef enum { OFDLOpenFlagLazy = 0, OFDLOpenFlagNow = 0 } OFDLOpenFlags; #endif Index: src/OFScrypt.h ================================================================== --- src/OFScrypt.h +++ src/OFScrypt.h @@ -29,11 +29,11 @@ @class OFHMAC; /** * @brief The parameters for @ref OFScrypt. */ -typedef struct OFScryptParameters { +typedef struct { /** @brief The block size to use. */ size_t blockSize; /** @brief The CPU/memory cost factor to use. */ size_t costFactor; /** @brief The parallelization to use. */ Index: src/OFSocket.h ================================================================== --- src/OFSocket.h +++ src/OFSocket.h @@ -128,11 +128,11 @@ /** * @struct OFSocketAddress OFSocket.h ObjFW/OFSocket.h * * @brief A struct which represents a host / port pair for a socket. */ -struct OF_BOXABLE OFSocketAddress { +typedef struct OF_BOXABLE { /* * Even though struct sockaddr contains the family, we need to use our * own family, as we need to support storing an IPv6 address on systems * that don't support IPv6. These may not have AF_INET6 defined and we * can't just define it, as the value is system-dependent and might @@ -144,12 +144,11 @@ struct sockaddr_in in; struct sockaddr_in6 in6; struct sockaddr_ipx ipx; } sockaddr; socklen_t length; -}; -typedef struct OFSocketAddress OFSocketAddress; +} OFSocketAddress; #ifdef __cplusplus extern "C" { #endif /** Index: src/OFString.h ================================================================== --- src/OFString.h +++ src/OFString.h @@ -63,11 +63,11 @@ typedef OFChar32 OFUnichar; /** * @brief The encoding of a string. */ -typedef enum OFStringEncoding { +typedef enum { /* * UTF-8 *has* to be 0, so that if the current @ref OFLocale is * `nil`, `[OFLocale encoding]` returns UTF-8. */ /** UTF-8 */ @@ -105,21 +105,21 @@ /** * @brief Options for searching in strings. * * This is a bit mask. */ -typedef enum OFStringSearchOptions { +typedef enum { /** Search backwards in the string */ OFStringSearchBackwards = 1 } OFStringSearchOptions; /** * @brief Options for separating strings. * * This is a bit mask. */ -typedef enum OFStringSeparationOptions { +typedef enum { /** Skip empty components */ OFStringSkipEmptyComponents = 1 } OFStringSeparationOptions; #ifdef OF_HAVE_BLOCKS Index: src/OFTLSKey.h ================================================================== --- src/OFTLSKey.h +++ src/OFTLSKey.h @@ -34,13 +34,13 @@ typedef DWORD OFTLSKey; #elif defined(OF_MORPHOS) # include typedef ULONG OFTLSKey; #elif defined(OF_AMIGAOS) -typedef struct OFTLSKey { +typedef struct _OFTLSKey { struct objc_hashtable *table; - struct OFTLSKey *next, *previous; + struct _OFTLSKey *next, *previous; } *OFTLSKey; #endif #ifdef __cplusplus extern "C" { Index: src/OFTarArchiveEntry.h ================================================================== --- src/OFTarArchiveEntry.h +++ src/OFTarArchiveEntry.h @@ -22,11 +22,11 @@ @class OFDate; /** * @brief The type of the archive entry. */ -typedef enum OFTarArchiveEntryType { +typedef enum { /** Normal file */ OFTarArchiveEntryTypeFile = '0', /** Hard link */ OFTarArchiveEntryTypeLink = '1', /** Symbolic link */ Index: src/OFZIPArchiveEntry.h ================================================================== --- src/OFZIPArchiveEntry.h +++ src/OFZIPArchiveEntry.h @@ -17,11 +17,11 @@ OF_ASSUME_NONNULL_BEGIN /** @file */ -typedef enum OFZIPArchiveEntryCompressionMethod { +typedef enum { OFZIPArchiveEntryCompressionMethodNone = 0, OFZIPArchiveEntryCompressionMethodShrink = 1, OFZIPArchiveEntryCompressionMethodReduceFactor1 = 2, OFZIPArchiveEntryCompressionMethodReduceFactor2 = 3, OFZIPArchiveEntryCompressionMethodReduceFactor3 = 4, @@ -36,11 +36,11 @@ } OFZIPArchiveEntryCompressionMethod; /** * @brief Attribute compatibility part of ZIP versions. */ -typedef enum OFZIPArchiveEntryAttributeCompatibility { +typedef enum { /** MS-DOS and OS/2 */ OFZIPArchiveEntryAttributeCompatibilityMSDOS = 0, /** Amiga */ OFZIPArchiveEntryAttributeCompatibilityAmiga = 1, /** OpenVMS */ @@ -82,11 +82,11 @@ } OFZIPArchiveEntryAttributeCompatibility; /** * @brief Tags for the extra field. */ -typedef enum OFZIPArchiveEntryExtraFieldTag { +typedef enum { /** ZIP64 extra field tag */ OFZIPArchiveEntryExtraFieldTagZIP64 = 0x0001 } OFZIPArchiveEntryExtraFieldTag; @class OFString; Index: src/exceptions/OFException.m ================================================================== --- src/exceptions/OFException.m +++ src/exceptions/OFException.m @@ -47,11 +47,11 @@ struct _Unwind_Context; typedef enum { _URC_OK = 0, _URC_END_OF_STACK = 5 -}_Unwind_Reason_Code; +} _Unwind_Reason_Code; struct BacktraceCtx { void **backtrace; uint8_t i; };