Backed out changeset da25394a8b55 (bug 802706) for build bustage

extensions/gio/nsGIOProtocolHandler.cpp

@@ -7,6 +7,7 @@
  * This code is based on original Mozilla gnome-vfs extension. It implements
  * input stream provided by GVFS/GIO.
 */
+#include "NSPRFormatTime.h" // must be before anything that includes prtime.h
 #include "mozilla/ModuleUtils.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"

modules/libjar/nsJARInputStream.cpp

@@ -5,6 +5,7 @@
  * 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/. */
 
+#include "NSPRFormatTime.h" // must be before anything that includes prtime.h
 #include "nsJARInputStream.h"
 #include "zipstruct.h"         // defines ZIP compression codes
 #include "nsZipArchive.h"

netwerk/base/src/nsDirectoryIndexStream.cpp

@@ -14,6 +14,7 @@
 
  */
 
+#include "NSPRFormatTime.h" // must be before anything that includes prtime.h
 #include "nsEscape.h"
 #include "nsDirectoryIndexStream.h"
 #include "nsXPIDLString.h"

netwerk/cookie/nsCookieService.cpp

@@ -10,6 +10,7 @@
 #define FORCE_PR_LOG // Allow logging in the release build
 #endif
 
+#include "NSPRFormatTime.h" // must be before anything that includes prtime.h
 #include "mozilla/net/CookieServiceChild.h"
 #include "mozilla/net/NeckoCommon.h"
 

netwerk/protocol/about/nsAboutBloat.cpp

@@ -3,6 +3,7 @@
  * 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/. */
 
+#include "NSPRFormatTime.h" // must be before anything that includes prtime.h
 #include "nsTraceRefcntImpl.h"
 
 // if NS_BUILD_REFCNT_LOGGING isn't defined, don't try to build

netwerk/protocol/about/nsAboutCache.cpp

@@ -3,6 +3,7 @@
  * 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/. */
 
+#include "NSPRFormatTime.h" // must be before anything that includes prtime.h
 #include "nsAboutCache.h"
 #include "nsIIOService.h"
 #include "nsIServiceManager.h"

netwerk/protocol/about/nsAboutCacheEntry.cpp

@@ -5,6 +5,7 @@
 
 #include <limits.h>
 
+#include "NSPRFormatTime.h" // must be before anything that includes prtime.h
 #include "nsAboutCacheEntry.h"
 #include "nsICacheService.h"
 #include "nsICacheSession.h"

netwerk/streamconv/converters/nsFTPDirListingConv.cpp

@@ -3,6 +3,7 @@
  * 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/. */
 
+#include "NSPRFormatTime.h" // must be before anything that includes prtime.h
 #include "nsFTPDirListingConv.h"
 #include "nsMemory.h"
 #include "plstr.h"

netwerk/test/TestProtocols.cpp

@@ -12,6 +12,7 @@
     -Gagan Saksena 04/29/99
 */
 
+#include "NSPRFormatTime.h" // must be before anything that includes prtime.h
 #include "TestCommon.h"
 
 #define FORCE_PR_LOG

rdf/base/src/rdfutil.cpp

@@ -19,6 +19,7 @@
 
  */
 
+#include "NSPRFormatTime.h" // must be before anything that includes prtime.h
 #include "nsCOMPtr.h"
 #include "nsIRDFDataSource.h"
 #include "nsIRDFNode.h"

toolkit/xre/nsConsoleWriter.cpp

@@ -2,6 +2,7 @@
  * 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/. */
 
+#include "NSPRFormatTime.h" // must include before any headers that include prtime.h
 #include "nsAppRunner.h"
 
 #include "prio.h"

xpcom/base/Makefile.in

@@ -68,6 +68,7 @@ EXPORTS		= \
 		nsWeakPtr.h \
 		nsInterfaceRequestorAgg.h \
 		nsGZFileWriter.h \
+		NSPRFormatTime.h \
 		$(NULL)
 
 EXPORTS_NAMESPACES = mozilla

xpcom/base/NSPRFormatTime.h

@@ -0,0 +1,12 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
+
+// Temporarily undefine to build successfully with NO_NSPR_10_SUPPORT
+#ifdef prtime_h___
+#error NSPRFormatTime.h must be included before any header that includes prtime.h
+#endif
+#undef NO_NSPR_10_SUPPORT
+#include "prtime.h"
+#define NO_NSPR_10_SUPPORT