Update NSS and NSPR to NSS_3_12_6_BETA1 and NSPR_4_8_4_BETA1....

nss/mozilla/nsprpub/pr/include/md/_win95.h

 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
@@ skipping 34 matching lines @@
 #include <errno.h>
 
 /*
  * Internal configuration macros
  */
 
 #define PR_LINKER_ARCH      "win32"
 #define _PR_SI_SYSNAME        "WIN95"
 #if defined(_M_IX86) || defined(_X86_)
 #define _PR_SI_ARCHITECTURE   "x86"
-#elif defined(_AMD64_)
+#elif defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)
 #define _PR_SI_ARCHITECTURE   "x86-64"
-#elif defined(_IA64_)
+#elif defined(_M_IA64) || defined(_IA64_)
 #define _PR_SI_ARCHITECTURE   "ia64"
-#elif defined(_ARM_)
+#elif defined(_M_ARM) || defined(_ARM_)
 #define _PR_SI_ARCHITECTURE   "arm"
 #else
 #error unknown processor architecture
 #endif
 
 #define HAVE_DLL
 #undef  HAVE_THREAD_AFFINITY
 #define _PR_HAVE_GETADDRINFO
 #define _PR_INET6_PROBE
 #ifndef _PR_INET6
@@ skipping 490 matching lines @@
 
 /* --- Named semaphores stuff --- */
 #define _PR_HAVE_NAMED_SEMAPHORES
 #define _MD_OPEN_SEMAPHORE            _PR_MD_OPEN_SEMAPHORE
 #define _MD_WAIT_SEMAPHORE            _PR_MD_WAIT_SEMAPHORE
 #define _MD_POST_SEMAPHORE            _PR_MD_POST_SEMAPHORE
 #define _MD_CLOSE_SEMAPHORE           _PR_MD_CLOSE_SEMAPHORE
 #define _MD_DELETE_SEMAPHORE(name)    PR_SUCCESS  /* no op */
 
 #endif /* nspr_win32_defs_h___ */