Merged 1.0 final into 1.1 branch.
authorJens Alfke <jens@mooseyard.com>
Sun Jul 13 10:59:06 2008 -0700 (2008-07-13)
changeset 23ffdaa33a408a
parent 22 8b883753394a
parent 21 56aed3578628
child 24 ab88e3ee5726
Merged 1.0 final into 1.1 branch.
MYNetwork.xcodeproj/project.pbxproj
     1.1 --- a/.hgtags	Sun Jul 13 10:42:50 2008 -0700
     1.2 +++ b/.hgtags	Sun Jul 13 10:59:06 2008 -0700
     1.3 @@ -1,1 +1,2 @@
     1.4  2c4bb6968927ac49809c0f8dcfdc0d1b347e079c release_1
     1.5 +02224e98120993726f618bd5949a8a2277b7e1bc 1.0
     2.1 --- a/TCP/TCPConnection.m	Sun Jul 13 10:42:50 2008 -0700
     2.2 +++ b/TCP/TCPConnection.m	Sun Jul 13 10:59:06 2008 -0700
     2.3 @@ -14,7 +14,7 @@
     2.4  #import "ExceptionUtils.h"
     2.5  
     2.6  
     2.7 -#if TARGET_OS_IPHONE
     2.8 +#if (TARGET_OS_IPHONE && !(TARGET_OS_MAC || TARGET_OS_EMBEDDED))
     2.9  // SecureTransport.h is missing on iPhone, with its SSL constants:
    2.10  enum{
    2.11      errSSLClosedAbort 			= -9806,	/* connection closed via error */