Update to NSPR 4.9.5 Beta 2, part 2: actual changes.

mozilla/nsprpub/pr/src/io/prmapopt.c

 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
  * This file defines _PR_MapOptionName().  The purpose of putting
  * _PR_MapOptionName() in a separate file is to work around a Winsock
  * header file problem on Windows NT.
  *
@@ skipping 15 matching lines @@
 #ifndef IP_TTL
 #define IP_TTL 7
 #endif
 #ifndef IP_TOS
 #define IP_TOS 8
 #endif
 #endif
 
 #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
 
 #ifndef _PR_PTHREADS
 
 PRStatus PR_CALLBACK _PR_SocketGetSocketOption(PRFileDesc *fd, PRSocketOptionData *data)
 {
     PRStatus rv;
     PRInt32 length;
@@ skipping 301 matching lines @@
  * Sanity check.  SO_LINGER and TCP_NODELAY should be available
  * on all platforms.  Just to make sure we have included the
  * appropriate header files.  Then any undefined socket options
  * are really missing.
  */
 
 #if !defined(SO_LINGER)
 #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
  * a valid socket option.
  */
 #define _PR_NO_SUCH_SOCKOPT -1
 
 #ifndef SO_KEEPALIVE
 #define SO_KEEPALIVE        _PR_NO_SUCH_SOCKOPT
 #endif
@@ skipping 73 matching lines @@
 
     if (socketOptions[optname] == _PR_NO_SUCH_SOCKOPT)
     {
         PR_SetError(PR_OPERATION_NOT_SUPPORTED_ERROR, 0);
         return PR_FAILURE;
     }
     *name = socketOptions[optname];
     *level = socketLevels[optname];
     return PR_SUCCESS;
 }  /* _PR_MapOptionName */