Bug 829685 - Remove #include "prtypes.h" from some files that no longer use PR types. r=ehsan
authorChris Peterson <cpeterson@mozilla.com>
Thu, 10 Jan 2013 08:19:36 -0800
changeset 120117 97dc4bb4507285145ba0f3aa855a6e83f24e4b18
parent 120116 98c2750c585df37449d2a028506a8c6a11640844
child 120118 c9ec22f372adf0070a24089f7495eaf3f5ba7a75
push idunknown
push userunknown
push dateunknown
reviewersehsan
bugs829685
milestone21.0a1
Bug 829685 - Remove #include "prtypes.h" from some files that no longer use PR types. r=ehsan
accessible/src/generic/TableAccessible.h
content/base/src/nsPropertyTable.h
content/base/src/nsScriptElement.h
content/canvas/src/CanvasUtils.h
content/html/content/public/nsIFormProcessor.h
content/media/VideoUtils.cpp
content/smil/nsSMILRepeatCount.h
content/smil/nsSMILTargetIdentifier.h
content/smil/nsSMILTimeValue.h
content/xslt/src/base/txCore.h
content/xul/templates/src/nsContentSupportMap.h
gfx/2d/convolver.h
netwerk/dns/nameprep_template.c
parser/html/nsHtml5ByteReadable.h
parser/html/nsHtml5TreeOpExecutor.h
parser/htmlparser/public/nsIDTD.h
parser/htmlparser/public/nsIParser.h
parser/htmlparser/public/nsIParserNode.h
parser/htmlparser/public/nsITokenizer.h
startupcache/StartupCache.h
toolkit/components/autocomplete/nsAutoCompleteSimpleResult.h
toolkit/mozapps/update/common/updatedefines.h
toolkit/xre/MacLaunchHelper.h
toolkit/xre/MacLaunchHelper.mm
widget/cocoa/nsCocoaFeatures.h
widget/nsWidgetInitData.h
widget/xpwidgets/GfxDriverInfo.h
widget/xpwidgets/nsNativeTheme.h
xpcom/ds/TimeStamp.h
--- a/accessible/src/generic/TableAccessible.h
+++ b/accessible/src/generic/TableAccessible.h
@@ -4,17 +4,16 @@
  * 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/. */
 
 #ifndef TABLE_ACCESSIBLE_H
 #define TABLE_ACCESSIBLE_H
 
 #include "nsString.h"
 #include "nsTArray.h"
-#include "prtypes.h"
 
 namespace mozilla {
 namespace a11y {
 
 class Accessible;
 
 /**
  * Accessible table interface.
--- a/content/base/src/nsPropertyTable.h
+++ b/content/base/src/nsPropertyTable.h
@@ -19,17 +19,16 @@
  * themselves.  Nodes can be any type of object; the hashtable keys are
  * nsIAtom pointers, and the values are void pointers.
  */
 
 #ifndef nsPropertyTable_h_
 #define nsPropertyTable_h_
 
 #include "nscore.h"
-#include "prtypes.h"
 
 class nsIAtom;
 
 typedef void
 (*NSPropertyFunc)(void           *aObject,
                   nsIAtom        *aPropertyName,
                   void           *aPropertyValue,
                   void           *aData);
--- a/content/base/src/nsScriptElement.h
+++ b/content/base/src/nsScriptElement.h
@@ -1,16 +1,15 @@
 /* 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/. */
 
 #include "nsIScriptLoaderObserver.h"
 #include "nsIScriptElement.h"
 #include "nsStubMutationObserver.h"
-#include "prtypes.h"
 
 /**
  * Baseclass useful for script elements (such as <xhtml:script> and
  * <svg:script>). Currently the class assumes that only the 'src'
  * attribute and the children of the class affect what script to execute.
  */
 
 class nsScriptElement : public nsIScriptElement,
--- a/content/canvas/src/CanvasUtils.h
+++ b/content/canvas/src/CanvasUtils.h
@@ -1,18 +1,16 @@
 /* -*- Mode: C++; tab-width: 20; 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/. */
 
 #ifndef _CANVASUTILS_H_
 #define _CANVASUTILS_H_
 
-#include "prtypes.h"
-
 #include "mozilla/CheckedInt.h"
 
 class nsIPrincipal;
 
 namespace mozilla {
 
 namespace gfx {
 class Matrix;
--- a/content/html/content/public/nsIFormProcessor.h
+++ b/content/html/content/public/nsIFormProcessor.h
@@ -9,18 +9,16 @@
  * @created  kmcclusk 10/19/99
  * 
  */
 
 #ifndef nsIFormProcessor_h__
 #define nsIFormProcessor_h__
 
 #include "nsISupports.h"
-#include "prtypes.h"
-
 #include "nsIDOMHTMLInputElement.h"
 #include "nsTArray.h"
 
 class nsString;
 
 // {0ae53c0f-8ea2-4916-bedc-717443c3e185}
 #define NS_FORMPROCESSOR_CID \
 { 0x0ae53c0f, 0x8ea2, 0x4916, { 0xbe, 0xdc, 0x71, 0x74, 0x43, 0xc3, 0xe1, 0x85 } }
--- a/content/media/VideoUtils.cpp
+++ b/content/media/VideoUtils.cpp
@@ -1,17 +1,16 @@
 /* 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/. */
 
 #include "VideoUtils.h"
 #include "MediaResource.h"
 #include "nsTimeRanges.h"
 #include "nsMathUtils.h"
-#include "prtypes.h"
 
 #include "mozilla/StandardInteger.h"
 
 // Converts from number of audio frames to microseconds, given the specified
 // audio rate.
 CheckedInt64 FramesToUsecs(int64_t aFrames, uint32_t aRate) {
   return (CheckedInt64(aFrames) * USECS_PER_S) / aRate;
 }
--- a/content/smil/nsSMILRepeatCount.h
+++ b/content/smil/nsSMILRepeatCount.h
@@ -1,14 +1,13 @@
 /* -*- Mode: C++; tab-width: 2; 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/. */
 
-#include "prtypes.h"
 #include "nsDebug.h"
 #include <math.h>
 
 //----------------------------------------------------------------------
 // nsSMILRepeatCount
 //
 // A tri-state non-negative floating point number for representing the number of
 // times an animation repeat, i.e. the SMIL repeatCount attribute.
--- a/content/smil/nsSMILTargetIdentifier.h
+++ b/content/smil/nsSMILTargetIdentifier.h
@@ -3,17 +3,16 @@
  * 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/. */
 
 #ifndef NS_SMILTARGETIDENTIFIER_H_
 #define NS_SMILTARGETIDENTIFIER_H_
 
 #include "mozilla/dom/Element.h"
 #include "nsAutoPtr.h"
-#include "prtypes.h"
 
 /**
  * Struct: nsSMILTargetIdentifier
  *
  * Tuple of: { Animated Element, Attribute Name, Attribute Type (CSS vs. XML) }
  *
  * Used in nsSMILAnimationController as hash key for mapping an animation
  * target to the nsSMILCompositor for that target.
--- a/content/smil/nsSMILTimeValue.h
+++ b/content/smil/nsSMILTimeValue.h
@@ -1,18 +1,16 @@
 /* -*- Mode: C++; tab-width: 2; 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/. */
 
 #ifndef NS_SMILTIMEVALUE_H_
 #define NS_SMILTIMEVALUE_H_
 
-#include "prtypes.h"
-#include "prlong.h"
 #include "nsSMILTypes.h"
 #include "nsDebug.h"
 
 /*----------------------------------------------------------------------
  * nsSMILTimeValue class
  *
  * A tri-state time value.
  *
--- a/content/xslt/src/base/txCore.h
+++ b/content/xslt/src/base/txCore.h
@@ -4,17 +4,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef __txCore_h__
 #define __txCore_h__
 
 #include "nscore.h"
 #include "nsDebug.h"
 #include "nsTraceRefcnt.h"
-#include "prtypes.h"
 
 class nsAString;
 
 class txObject
 {
 public:
     txObject()
     {
--- a/content/xul/templates/src/nsContentSupportMap.h
+++ b/content/xul/templates/src/nsContentSupportMap.h
@@ -1,17 +1,16 @@
 /* -*- Mode: C++; tab-width: 4; 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/. */
 
 #ifndef nsContentSupportMap_h__
 #define nsContentSupportMap_h__
 
-#include "prtypes.h"
 #include "pldhash.h"
 #include "nsFixedSizeAllocator.h"
 #include "nsTemplateMatch.h"
 
 /**
  * The nsContentSupportMap maintains a mapping from a "resource element"
  * in the content tree to the nsTemplateMatch that was used to instantiate it. This
  * is necessary to allow the XUL content to be built lazily. Specifically,
--- a/gfx/2d/convolver.h
+++ b/gfx/2d/convolver.h
@@ -28,17 +28,16 @@
 
 #ifndef SKIA_EXT_CONVOLVER_H_
 #define SKIA_EXT_CONVOLVER_H_
 
 #include <cmath>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "prtypes.h"
 #include "base/cpu.h"
 #include "skia/SkTypes.h"
 
 // avoid confusion with Mac OS X's math library (Carbon)
 #if defined(__APPLE__)
 #undef FloatToFixed
 #undef FixedToFloat
 #endif
--- a/netwerk/dns/nameprep_template.c
+++ b/netwerk/dns/nameprep_template.c
@@ -43,18 +43,16 @@
 /*
  * Include this file once for each version of NAMEPREP.
  * VERSION should be defined to appropriate value before inclusion.
  */
 
 #ifndef NAMEPREP_TEMPLATE_INIT
 #define NAMEPREP_TEMPLATE_INIT
 
-#include "prtypes.h"
-
 /* Symbol composition. */
 #define compose_sym2(a, b)		compose_sym2X(a, b)
 #define compose_sym2X(a, b)		a ## b
 #define compose_sym3(a, b, c)		compose_sym3X(a, b, c)
 #define compose_sym3X(a, b, c)		a ## b ## c
 
 /* The table is based on "Optimized Two-Stage Table" mentioned in
  * Unicode 3.0 page 106, extended to handle 21bit data instead of 16 bit.
--- a/parser/html/nsHtml5ByteReadable.h
+++ b/parser/html/nsHtml5ByteReadable.h
@@ -1,17 +1,15 @@
 /* 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/. */
- 
+
 #ifndef nsHtml5ByteReadable_h__
 #define nsHtml5ByteReadable_h__
 
-#include "prtypes.h"
-
 /**
  * A weak reference wrapper around a byte array.
  */
 class nsHtml5ByteReadable
 {
   public:
 
     nsHtml5ByteReadable(const uint8_t* current, const uint8_t* end)
--- a/parser/html/nsHtml5TreeOpExecutor.h
+++ b/parser/html/nsHtml5TreeOpExecutor.h
@@ -1,16 +1,15 @@
 /* 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/. */
 
 #ifndef nsHtml5TreeOpExecutor_h__
 #define nsHtml5TreeOpExecutor_h__
 
-#include "prtypes.h"
 #include "nsIAtom.h"
 #include "nsINameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsTraceRefcnt.h"
 #include "nsHtml5TreeOperation.h"
 #include "nsHtml5SpeculativeLoad.h"
 #include "nsHtml5PendingNotification.h"
--- a/parser/htmlparser/public/nsIDTD.h
+++ b/parser/htmlparser/public/nsIDTD.h
@@ -18,17 +18,16 @@
  *      2) To serve as proxy to represent the containment rules of the
  *      underlying document
  *      3) To offer autodetection services to the parser (mainly for doc
  *      conversion)
  * */
 
 #include "nsISupports.h"
 #include "nsStringGlue.h"
-#include "prtypes.h"
 #include "nsITokenizer.h"
 
 #define NS_IDTD_IID \
 { 0x3de05873, 0xefa7, 0x410d, \
   { 0xa4, 0x61, 0x80, 0x33, 0xaf, 0xd9, 0xe3, 0x26 } }
 
 enum eAutoDetectResult {
     eUnknownDetect,
--- a/parser/htmlparser/public/nsIParser.h
+++ b/parser/htmlparser/public/nsIParser.h
@@ -251,17 +251,16 @@ class nsIParser : public nsParserBase {
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIParser, NS_IPARSER_IID)
 
 /* ===========================================================*
   Some useful constants...
  * ===========================================================*/
 
-#include "prtypes.h"
 #include "nsError.h"
 
 const nsresult  kEOF              = NS_ERROR_HTMLPARSER_EOF;
 const nsresult  kUnknownError     = NS_ERROR_HTMLPARSER_UNKNOWN;
 const nsresult  kCantPropagate    = NS_ERROR_HTMLPARSER_CANTPROPAGATE;
 const nsresult  kContextMismatch  = NS_ERROR_HTMLPARSER_CONTEXTMISMATCH;
 const nsresult  kBadFilename      = NS_ERROR_HTMLPARSER_BADFILENAME;
 const nsresult  kBadURL           = NS_ERROR_HTMLPARSER_BADURL;
--- a/parser/htmlparser/public/nsIParserNode.h
+++ b/parser/htmlparser/public/nsIParserNode.h
@@ -19,17 +19,16 @@
  * make your own copy.
  *
  */
 
 #ifndef NS_IPARSERNODE__
 #define NS_IPARSERNODE__
 
 #include "nsISupports.h"
-#include "prtypes.h"
 #include "nsStringGlue.h"
 #include "nsDebug.h"
 
 //#define HEAP_ALLOCATED_NODES 
 //#define DEBUG_TRACK_NODES
 
 class nsIAtom;
 class CToken;
--- a/parser/htmlparser/public/nsITokenizer.h
+++ b/parser/htmlparser/public/nsITokenizer.h
@@ -9,17 +9,16 @@
  * @update  gess 4/1/98
  * 
  */
 
 #ifndef __NSITOKENIZER__
 #define __NSITOKENIZER__
 
 #include "nsISupports.h"
-#include "prtypes.h"
 
 class CToken;
 class nsScanner;
 class nsDeque;
 class nsTokenAllocator;
 
 #define NS_ITOKENIZER_IID      \
   {0xe4238ddc, 0x9eb6,  0x11d2, {0xba, 0xa5, 0x0,     0x10, 0x4b, 0x98, 0x3f, 0xd4 }}
--- a/startupcache/StartupCache.h
+++ b/startupcache/StartupCache.h
@@ -1,26 +1,20 @@
 /* -*-  Mode: C++; tab-width: 2; 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/. */
 
 #ifndef StartupCache_h_
 #define StartupCache_h_
 
-#include "prio.h"
-#include "prtypes.h"
-
 #include "nsClassHashtable.h"
-#include "nsIZipWriter.h"
-#include "nsIZipReader.h"
 #include "nsComponentManagerUtils.h"
 #include "nsZipArchive.h"
 #include "nsIStartupCache.h"
-#include "nsIStorageStream.h"
 #include "nsITimer.h"
 #include "nsIObserverService.h"
 #include "nsIObserver.h"
 #include "nsIOutputStream.h"
 #include "nsIFile.h"
 #include "mozilla/Attributes.h"
 
 /**
--- a/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.h
+++ b/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.h
@@ -4,17 +4,16 @@
 
 #ifndef __nsAutoCompleteSimpleResult__
 #define __nsAutoCompleteSimpleResult__
 
 #include "nsIAutoCompleteResult.h"
 #include "nsIAutoCompleteSimpleResult.h"
 
 #include "nsString.h"
-#include "prtypes.h"
 #include "nsCOMPtr.h"
 #include "nsTArray.h"
 #include "mozilla/Attributes.h"
 
 class nsAutoCompleteSimpleResult MOZ_FINAL : public nsIAutoCompleteSimpleResult
 {
 public:
   nsAutoCompleteSimpleResult();
--- a/toolkit/mozapps/update/common/updatedefines.h
+++ b/toolkit/mozapps/update/common/updatedefines.h
@@ -1,16 +1,15 @@
 /* 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/. */
 
 #ifndef UPDATEDEFINES_H
 #define UPDATEDEFINES_H
 
-#include "prtypes.h"
 #include "readstrings.h"
 
 #ifndef MAXPATHLEN
 # ifdef PATH_MAX
 #  define MAXPATHLEN PATH_MAX
 # elif defined(MAX_PATH)
 #  define MAXPATHLEN MAX_PATH
 # elif defined(_MAX_PATH)
--- a/toolkit/xre/MacLaunchHelper.h
+++ b/toolkit/xre/MacLaunchHelper.h
@@ -1,14 +1,18 @@
 /* -*- Mode: C++; tab-width: 2; 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/. */
 
 #ifndef MacLaunchHelper_h_
 #define MacLaunchHelper_h_
 
+#include "mozilla/StandardInteger.h"
+
+#include <unistd.h>
+
 extern "C" {
   void LaunchChildMac(int aArgc, char** aArgv, uint32_t aRestartType = 0,
                       pid_t *pid = 0);
 }
 
 #endif
--- a/toolkit/xre/MacLaunchHelper.mm
+++ b/toolkit/xre/MacLaunchHelper.mm
@@ -1,16 +1,13 @@
 /* -*- Mode: C++; tab-width: 2; 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/. */
 
-#include "mozilla/Util.h"
-
-#include "prtypes.h"
 #include "MacLaunchHelper.h"
 
 #include "nsMemory.h"
 #include "nsAutoPtr.h"
 #include "nsIAppStartup.h"
 
 #include <stdio.h>
 #include <spawn.h>
--- a/widget/cocoa/nsCocoaFeatures.h
+++ b/widget/cocoa/nsCocoaFeatures.h
@@ -2,17 +2,16 @@
 /* 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/. */
 
 #ifndef nsCocoaFeatures_h_
 #define nsCocoaFeatures_h_
 
 #include "mozilla/StandardInteger.h"
-#include "prtypes.h"
 
 class nsCocoaFeatures {
 public:
   static int32_t OSXVersion();
   static bool OnLionOrLater();
   static bool OnMountainLionOrLater();
   static bool SupportCoreAnimationPlugins();
 
--- a/widget/nsWidgetInitData.h
+++ b/widget/nsWidgetInitData.h
@@ -1,18 +1,16 @@
 /* -*- Mode: C++; tab-width: 40; 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/. */
 
 #ifndef nsWidgetInitData_h__
 #define nsWidgetInitData_h__
 
-#include "prtypes.h"
-
 /**
  * Window types
  *
  * Don't alter previously encoded enum values - 3rd party apps may look at
  * these.
  */
 enum nsWindowType {
   eWindowType_toplevel,  // default top level window
--- a/widget/xpwidgets/GfxDriverInfo.h
+++ b/widget/xpwidgets/GfxDriverInfo.h
@@ -1,14 +1,13 @@
 /* -*- Mode: C++; tab-width: 2; 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/. */
 
-#include "prtypes.h"
 #include "nsString.h"
 
 #ifndef __mozilla_widget_GfxDriverInfo_h__
 #define __mozilla_widget_GfxDriverInfo_h__
 
 // Macros for adding a blocklist item to the static list.
 #define APPEND_TO_DRIVER_BLOCKLIST(os, vendor, devices, feature, featureStatus, driverComparator, driverVersion, suggestedVersion) \
     mDriverInfo->AppendElement(GfxDriverInfo(os, vendor, devices, feature, featureStatus, driverComparator, driverVersion, suggestedVersion))
--- a/widget/xpwidgets/nsNativeTheme.h
+++ b/widget/xpwidgets/nsNativeTheme.h
@@ -1,17 +1,16 @@
 /* -*- Mode: C++; tab-width: 2; 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 defines a common base class for nsITheme implementations, to reduce
 // code duplication.
 
-#include "prtypes.h"
 #include "nsAlgorithm.h"
 #include "nsIAtom.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsMargin.h"
 #include "nsGkAtoms.h"
 #include "nsEventStates.h"
 #include "nsTArray.h"
--- a/xpcom/ds/TimeStamp.h
+++ b/xpcom/ds/TimeStamp.h
@@ -6,17 +6,16 @@
 
 #ifndef mozilla_TimeStamp_h
 #define mozilla_TimeStamp_h
 
 #include "mozilla/Assertions.h"
 
 #include "prinrval.h"
 #include "nsDebug.h"
-#include "prlong.h"
 
 namespace IPC {
 template <typename T> struct ParamTraits;
 }
 
 namespace mozilla {
 
 class TimeStamp;