Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: mozilla/nsprpub/pr/src/io/prmapopt.c

Issue 12089033: Update to NSPR 4.9.5 Beta 2, part 2: actual changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mozilla/nsprpub/pr/src/io/prlayer.c ('k') | mozilla/nsprpub/pr/src/io/prscanf.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mozilla/nsprpub/pr/src/io/prmapopt.c
===================================================================
--- mozilla/nsprpub/pr/src/io/prmapopt.c (revision 179237)
+++ mozilla/nsprpub/pr/src/io/prmapopt.c (working copy)
@@ -33,11 +33,6 @@
#include "primpl.h"
-#if defined(NEXTSTEP)
-/* NEXTSTEP is special: this must come before netinet/tcp.h. */
-#include <netinet/in_systm.h> /* n_short, n_long, n_time */
-#endif
-
#ifdef HAVE_NETINET_TCP_H
#include <netinet/tcp.h> /* TCP_NODELAY, TCP_MAXSEG */
#endif
@@ -359,15 +354,9 @@
#error "SO_LINGER is not defined"
#endif
-/*
- * Some platforms, such as NCR 2.03, don't have TCP_NODELAY defined
- * in <netinet/tcp.h>
- */
-#if !defined(NCR)
#if !defined(TCP_NODELAY)
#error "TCP_NODELAY is not defined"
#endif
-#endif
/*
* Make sure the value of _PR_NO_SUCH_SOCKOPT is not
« no previous file with comments | « mozilla/nsprpub/pr/src/io/prlayer.c ('k') | mozilla/nsprpub/pr/src/io/prscanf.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698