diff options
| author | beard%netscape.com <devnull@localhost> | 2000-04-19 22:13:16 +0000 |
|---|---|---|
| committer | beard%netscape.com <devnull@localhost> | 2000-04-19 22:13:16 +0000 |
| commit | 0d9118142cb761ece218e4ab25053bfbb674819c (patch) | |
| tree | 319a0c36301188f9577952ca027a8efbaa9014db | |
| parent | d03f5b02d834d217331fcdca5aa01c7d61a5c460 (diff) | |
| download | nspr-hg-0d9118142cb761ece218e4ab25053bfbb674819c.tar.gz | |
Compatibility with Universal Headers 3.3 or later. a=leaf
| -rw-r--r-- | pr/src/io/prmapopt.c | 2 | ||||
| -rw-r--r-- | pr/src/md/mac/macsockotpt.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pr/src/io/prmapopt.c b/pr/src/io/prmapopt.c index 075d3a6a..2b3dd7b8 100644 --- a/pr/src/io/prmapopt.c +++ b/pr/src/io/prmapopt.c @@ -388,7 +388,7 @@ PRStatus PR_CALLBACK _PR_SocketSetSocketOption(PRFileDesc *fd, const PRSocketOpt * Some platforms, such as NCR 2.03, don't have TCP_NODELAY defined * in <netinet/tcp.h> */ -#if !defined(NCR) +#if !defined(NCR) && !(defined(XP_MAC) && (UNIVERSAL_INTERFACES_VERSION >= 0x0330)) #if !defined(TCP_NODELAY) #error "TCP_NODELAY is not defined" #endif diff --git a/pr/src/md/mac/macsockotpt.c b/pr/src/md/mac/macsockotpt.c index f408d845..cffe9f3e 100644 --- a/pr/src/md/mac/macsockotpt.c +++ b/pr/src/md/mac/macsockotpt.c @@ -29,6 +29,12 @@ #define GESTALT_OPEN_TPT_TCP_PRESENT gestaltOpenTptTCPPresentMask #include <OpenTptInternet.h> // All the internet typedefs + +#if (UNIVERSAL_INTERFACES_VERSION >= 0x0330) +// for some reason Apple removed this typedef. +typedef struct OTConfiguration OTConfiguration; +#endif + #include "primpl.h" typedef enum SndRcvOpCode { |