Update to recent ObjFW changes.

This commit is contained in:
Jonathan Schleifer 2013-02-19 00:14:41 +01:00
parent 682fa461ed
commit 8eeb6a72d1
2 changed files with 4 additions and 4 deletions

View file

@ -131,7 +131,7 @@
4B1918E01341272300D82152 /* Project object */ = { 4B1918E01341272300D82152 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0420; LastUpgradeCheck = 0460;
}; };
buildConfigurationList = 4B1918E31341272300D82152 /* Build configuration list for PBXProject "ObjOpenSSL" */; buildConfigurationList = 4B1918E31341272300D82152 /* Build configuration list for PBXProject "ObjOpenSSL" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";

View file

@ -325,12 +325,12 @@ locking_callback(int mode, int n, const char *file, int line)
requestedLength: length]; requestedLength: length];
} }
- (size_t)pendingBytes - (size_t)numberOfBytesInReadBuffer
{ {
if (_SSL == NULL) if (_SSL == NULL)
return [super pendingBytes]; return [super numberOfBytesInReadBuffer];
return [super pendingBytes] + SSL_pending(_SSL); return [super numberOfBytesInReadBuffer] + SSL_pending(_SSL);
} }
- (void)setPrivateKeyFile: (OFString*)privateKeyFile - (void)setPrivateKeyFile: (OFString*)privateKeyFile