Overview
| Comment: | Fix building with Apple GCC 4.0.1 |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
2b7c5eb0ec5a10d13b78ba98b4fa71f0 |
| User & Date: | js on 2022-10-25 23:10:54 |
| Other Links: | manifest | tags |
Context
|
2022-10-26
| ||
| 20:58 | configure: Prefer GnuTLS over OpenSSL check-in: b8d47bbbf0 user: js tags: trunk | |
|
2022-10-25
| ||
| 23:10 | Fix building with Apple GCC 4.0.1 check-in: 2b7c5eb0ec user: js tags: trunk | |
| 21:30 | OFDDPSocket: Don't include node in bind check-in: 607d4d083c user: js tags: trunk | |
Changes
Modified src/OFMutableTarArchiveEntry.m from [f1fcc51707] to [693af0fda5].
| ︙ | ︙ | |||
22 23 24 25 26 27 28 29 30 31 32 33 34 35 |
#import "OFString.h"
@implementation OFMutableTarArchiveEntry
@dynamic fileName, POSIXPermissions, ownerAccountID, groupOwnerAccountID;
@dynamic compressedSize, uncompressedSize, modificationDate, type;
@dynamic targetFileName, ownerAccountName, groupOwnerAccountName, deviceMajor;
@dynamic deviceMinor;
+ (instancetype)entryWithFileName: (OFString *)fileName
{
return [[[self alloc] initWithFileName: fileName] autorelease];
}
- (instancetype)initWithFileName: (OFString *)fileName
| > > > > > | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 |
#import "OFString.h"
@implementation OFMutableTarArchiveEntry
@dynamic fileName, POSIXPermissions, ownerAccountID, groupOwnerAccountID;
@dynamic compressedSize, uncompressedSize, modificationDate, type;
@dynamic targetFileName, ownerAccountName, groupOwnerAccountName, deviceMajor;
@dynamic deviceMinor;
/*
* The following is optional in OFMutableArchiveEntry, but Apple GCC 4.0.1 is
* buggy and needs this to stop complaining.
*/
@dynamic fileComment;
+ (instancetype)entryWithFileName: (OFString *)fileName
{
return [[[self alloc] initWithFileName: fileName] autorelease];
}
- (instancetype)initWithFileName: (OFString *)fileName
|
| ︙ | ︙ |
Modified src/OFMutableZIPArchiveEntry.m from [5de5ffdaad] to [6a8c882277].
| ︙ | ︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 |
#import "OFOutOfRangeException.h"
@implementation OFMutableZIPArchiveEntry
@dynamic fileName, fileComment, extraField, versionMadeBy, minVersionNeeded;
@dynamic modificationDate, compressionMethod, compressedSize, uncompressedSize;
@dynamic CRC32, versionSpecificAttributes, generalPurposeBitFlag;
@dynamic of_localFileHeaderOffset;
+ (instancetype)entryWithFileName: (OFString *)fileName
{
return [[[self alloc] initWithFileName: fileName] autorelease];
}
- (instancetype)initWithFileName: (OFString *)fileName
| > > > > > > | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 |
#import "OFOutOfRangeException.h"
@implementation OFMutableZIPArchiveEntry
@dynamic fileName, fileComment, extraField, versionMadeBy, minVersionNeeded;
@dynamic modificationDate, compressionMethod, compressedSize, uncompressedSize;
@dynamic CRC32, versionSpecificAttributes, generalPurposeBitFlag;
@dynamic of_localFileHeaderOffset;
/*
* The following are optional in OFMutableArchiveEntry, but Apple GCC 4.0.1 is
* buggy and needs this to stop complaining.
*/
@dynamic POSIXPermissions, ownerAccountID, groupOwnerAccountID;
@dynamic ownerAccountName, groupOwnerAccountName;
+ (instancetype)entryWithFileName: (OFString *)fileName
{
return [[[self alloc] initWithFileName: fileName] autorelease];
}
- (instancetype)initWithFileName: (OFString *)fileName
|
| ︙ | ︙ |
Modified src/OFTarArchiveEntry.m from [6db7373fe9] to [6add4508d8].
| ︙ | ︙ | |||
71 72 73 74 75 76 77 78 79 80 81 82 83 84 |
if (value > max)
@throw [OFOutOfRangeException exception];
return value;
}
@implementation OFTarArchiveEntry
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (instancetype)of_init
{
| > > > > > > | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 |
if (value > max)
@throw [OFOutOfRangeException exception];
return value;
}
@implementation OFTarArchiveEntry
/*
* The following is optional in OFArchiveEntry, but Apple GCC 4.0.1 is buggy
* and needs this to stop complaining.
*/
@dynamic fileComment;
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (instancetype)of_init
{
|
| ︙ | ︙ |
Modified src/OFZIPArchiveEntry.m from [7156204ba2] to [87dd5a9fa3].
| ︙ | ︙ | |||
168 169 170 171 172 173 174 175 176 177 178 179 180 181 |
}
*size = 0;
return OFNotFound;
}
@implementation OFZIPArchiveEntry
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (instancetype)of_init
{
| > > > > > > > | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 |
}
*size = 0;
return OFNotFound;
}
@implementation OFZIPArchiveEntry
/*
* The following are optional in OFArchiveEntry, but Apple GCC 4.0.1 is buggy
* and needs this to stop complaining.
*/
@dynamic POSIXPermissions, ownerAccountID, groupOwnerAccountID;
@dynamic ownerAccountName, groupOwnerAccountName;
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (instancetype)of_init
{
|
| ︙ | ︙ |