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

mozilla/nsprpub/pr/src/io/prscanf.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/. */
 
 /*
  * Scan functions for NSPR types
  *
  * Author: Wan-Teh Chang
  *
  * Acknowledgment: The implementation is inspired by the source code
  * in P.J. Plauger's "The Standard C Library," Prentice-Hall, 1992.
  */
 
 #include <limits.h>
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
-#ifdef SUNOS4
-#include "md/sunos4.h"  /* for strtoul */
-#endif
 #include "prprf.h"
 #include "prdtoa.h"
 #include "prlog.h"
 #include "prerror.h"
 
 /*
  * A function that reads a character from 'stream'.
  * Returns the character read, or EOF if end of stream is reached.
  */
 typedef int (*_PRGetCharFN)(void *stream);
@@ skipping 596 matching lines @@
     ScanfState state;
 
     state.get = &StringGetChar;
     state.unget = &StringUngetChar;
     state.stream = (void *) &buf;
     va_start(state.ap, fmt);
     rv = DoScanf(&state, fmt);
     va_end(state.ap);
     return rv;
 }