Bug 579517 - Part 5: Add missing StandardInteger.h #includes where needed; r=bsmedberg
authorEhsan Akhgari <ehsan@mozilla.com>
Wed, 08 Aug 2012 17:08:17 -0400
changeset 103007 88e47f6905e9b154027744f6b2bb09034cd860b0
parent 103006 325891716910101f51fbb15f2bdd4730fe53cdf9
child 103008 f921ed75d75d35b920025324f50f8cefa577eb5b
child 103039 9c39400dd21d13d416759339f0505688e119629c
child 106719 c4f83d9d8243f3f853a5356188164a5fddee2b5a
push id1025
push userttaubert@mozilla.com
push dateThu, 23 Aug 2012 05:16:39 +0000
treeherderfx-team@5650196a8c7d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs579517
milestone17.0a1
Bug 579517 - Part 5: Add missing StandardInteger.h #includes where needed; r=bsmedberg Landing on a CLOSED TREE
accessible/src/base/ARIAStateMap.h
accessible/src/base/States.h
accessible/src/msaa/Compatibility.h
content/base/src/nsAtomListUtils.h
content/smil/nsSMILKeySpline.cpp
content/smil/nsSMILTypes.h
dom/plugins/test/testplugin/nptest.h
gfx/qcms/qcmstypes.h
gfx/ycbcr/chromium_types.h
intl/uconv/util/ubase.h
intl/unicharutil/util/nsSpecialCasingData.h
layout/base/nsFrameIterator.h
media/libjpeg/jmorecfg.h
modules/libmar/sign/nss_secutil.h
modules/libmar/src/mar.h
modules/libmar/src/mar_private.h
netwerk/dns/nsIDNKitInterface.h
other-licenses/snappy/snappy-stubs-public.h
security/manager/ssl/src/md4.h
toolkit/mozapps/update/updater/bspatch.h
widget/nsEvent.h
xpcom/typelib/xpt/public/xpt_arena.h
xpcom/typelib/xpt/public/xpt_struct.h
--- a/accessible/src/base/ARIAStateMap.h
+++ b/accessible/src/base/ARIAStateMap.h
@@ -2,17 +2,17 @@
 /* vim: set ts=2 et sw=2 tw=80: */
 /* 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 _mozilla_a11y_aria_ARIAStateMap_h_
 #define _mozilla_a11y_aria_ARIAStateMap_h_
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 namespace mozilla {
 
 namespace dom {
 class Element;
 }
 
 namespace a11y {
--- a/accessible/src/base/States.h
+++ b/accessible/src/base/States.h
@@ -2,17 +2,17 @@
 /* vim: set expandtab shiftwidth=2 tabstop=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 _states_h_
 #define _states_h_
 
-#include <prtypes.h>
+#include "mozilla/StandardInteger.h"
 
 namespace mozilla {
 namespace a11y {
 namespace states {
 
   /**
    * The object is disabled, opposite to enabled and sensitive.
    */
--- a/accessible/src/msaa/Compatibility.h
+++ b/accessible/src/msaa/Compatibility.h
@@ -2,17 +2,17 @@
 /* vim: set ts=2 et sw=2 tw=80: */
 /* 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 COMPATIBILITY_MANAGER_H
 #define COMPATIBILITY_MANAGER_H
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 class nsAccessNodeWrap;
 
 namespace mozilla {
 namespace a11y {
 
 /**
  * Used to get compatibility modes. Note, modes are computed at accessibility
--- a/content/base/src/nsAtomListUtils.h
+++ b/content/base/src/nsAtomListUtils.h
@@ -5,17 +5,17 @@
 
 /*
  * Static helper class for implementing atom lists.
  */
 
 #ifndef nsAtomListUtils_h__
 #define nsAtomListUtils_h__
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 class nsIAtom;
 struct nsStaticAtom;
 
 class nsAtomListUtils {
 public:
     static bool IsMember(nsIAtom *aAtom,
                            const nsStaticAtom* aInfo,
--- a/content/smil/nsSMILKeySpline.cpp
+++ b/content/smil/nsSMILKeySpline.cpp
@@ -1,15 +1,15 @@
 /* -*- 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 "nsSMILKeySpline.h"
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 #include <math.h>
 
 #define NEWTON_ITERATIONS          4
 #define NEWTON_MIN_SLOPE           0.02
 #define SUBDIVISION_PRECISION      0.0000001
 #define SUBDIVISION_MAX_ITERATIONS 10
 
 const double nsSMILKeySpline::kSampleStepSize =
--- a/content/smil/nsSMILTypes.h
+++ b/content/smil/nsSMILTypes.h
@@ -1,17 +1,17 @@
 /* -*- 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_SMILTYPES_H_
 #define NS_SMILTYPES_H_
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 // A timestamp in milliseconds
 //
 // A time may represent:
 //
 //   simple time -- offset within the simple duration
 //   active time -- offset within the active duration
 //   document time -- offset since the document begin
--- a/dom/plugins/test/testplugin/nptest.h
+++ b/dom/plugins/test/testplugin/nptest.h
@@ -35,16 +35,17 @@
 #define nptest_h_
 
 #include "mozilla-config.h"
 
 #include "npapi.h"
 #include "npfunctions.h"
 #include "npruntime.h"
 #include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 #include <string>
 #include <sstream>
 
 typedef enum  {
   DM_DEFAULT,
   DM_SOLID_COLOR
 } DrawMode;
 
--- a/gfx/qcms/qcmstypes.h
+++ b/gfx/qcms/qcmstypes.h
@@ -1,14 +1,15 @@
 #ifndef QCMS_TYPES_H
 #define QCMS_TYPES_H
 
 #ifdef MOZ_QCMS
 
 #include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
 
 #if defined (__SVR4) && defined (__sun)
 /* int_types.h gets included somehow, so avoid redefining the types differently */
 #include <sys/int_types.h>
 #elif defined (_AIX)
 #include <sys/types.h>
--- a/gfx/ycbcr/chromium_types.h
+++ b/gfx/ycbcr/chromium_types.h
@@ -1,16 +1,17 @@
 /* -*- 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 GFX_CHROMIUMTYPES_H
 #define GFX_CHROMIUMTYPES_H
 
 #include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 typedef uint8_t uint8;
 typedef int8_t int8;
 typedef int16_t int16;
 
 // From Chromium build_config.h:
 // Processor architecture detection.  For more info on what's defined, see:
 //   http://msdn.microsoft.com/en-us/library/b0084kay.aspx
--- a/intl/uconv/util/ubase.h
+++ b/intl/uconv/util/ubase.h
@@ -1,13 +1,14 @@
 /* -*- 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 ubase_h__
 #define ubase_h__
 
 #include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 #define PRIVATE 
 #define MODULE_PRIVATE
 
 #endif
--- a/intl/unicharutil/util/nsSpecialCasingData.h
+++ b/intl/unicharutil/util/nsSpecialCasingData.h
@@ -1,13 +1,14 @@
 /* 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 "mozilla/StandardInteger.h"
 
 namespace mozilla {
 namespace unicode {
 
 // Multi-character mappings (from SpecialCasing.txt) map a single Unicode
 // value to a sequence of 2 or 3 Unicode characters. There are currently none
 // defined outside the BMP, so we can use PRUnichar here. Unused trailing
 // positions in mMappedChars are set to 0.
--- a/layout/base/nsFrameIterator.h
+++ b/layout/base/nsFrameIterator.h
@@ -1,16 +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 NSFRAMEITERATOR_H
 #define NSFRAMEITERATOR_H
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 class nsPresContext;
 class nsIFrame;
 
 enum nsIteratorType {
   eLeaf,
   ePreOrder,
   ePostOrder
--- a/media/libjpeg/jmorecfg.h
+++ b/media/libjpeg/jmorecfg.h
@@ -7,16 +7,17 @@
  * For conditions of distribution and use, see the accompanying README file.
  *
  * This file contains additional configuration options that customize the
  * JPEG software for special applications or support machine-dependent
  * optimizations.  Most users will not need to touch this file.
  */
 
 #include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 /*
  * Define BITS_IN_JSAMPLE as either
  *   8   for 8-bit sample values (the usual setting)
  *   12  for 12-bit sample values
  * Only 8 and 12 are legal data precisions for lossy JPEG according to the
  * JPEG standard, and the IJG code does not support anything else!
  * We do not support run-time selection of data precision, sorry.
--- a/modules/libmar/sign/nss_secutil.h
+++ b/modules/libmar/sign/nss_secutil.h
@@ -9,16 +9,17 @@
 #define NSS_SECUTIL_H_
 
 #include "nss.h"
 #include "pk11pub.h"
 #include "cryptohi.h"
 #include "hasht.h"
 #include "cert.h"
 #include "key.h"
+#include "mozilla/StandardInteger.h"
 
 typedef struct {
   enum {
     PW_NONE = 0,
     PW_FROMFILE = 1,
     PW_PLAINTEXT = 2,
     PW_EXTERNAL = 3
   } source;
--- a/modules/libmar/src/mar.h
+++ b/modules/libmar/src/mar.h
@@ -4,16 +4,17 @@
  * 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 MAR_H__
 #define MAR_H__
 
 /* We use NSPR here just to import the definition of uint32_t */
 #include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct ProductInformationBlock {
   const char *MARChannelID;
   const char *productVersion;
--- a/modules/libmar/src/mar_private.h
+++ b/modules/libmar/src/mar_private.h
@@ -4,16 +4,17 @@
  * 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 MAR_PRIVATE_H__
 #define MAR_PRIVATE_H__
 
 #include "prtypes.h"
 #include "limits.h"
+#include "mozilla/StandardInteger.h"
 
 /* Code in this module requires a guarantee that the size
    of uint32_t and uint64_t are 4 and 8 bytes respectively. */
 PR_STATIC_ASSERT(sizeof(uint32_t) == 4);
 PR_STATIC_ASSERT(sizeof(uint64_t) == 8);
 
 #define BLOCKSIZE 4096
 #define ROUND_UP(n, incr) (((n) / (incr) + 1) * (incr))
--- a/netwerk/dns/nsIDNKitInterface.h
+++ b/netwerk/dns/nsIDNKitInterface.h
@@ -42,17 +42,17 @@
 
 #ifndef nsIDNKitWrapper_h__
 #define nsIDNKitWrapper_h__
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 /*
  * libidnkit result code.
  */
 typedef enum {
 	idn_success,
 	idn_notfound,
 	idn_invalid_encoding,
--- a/other-licenses/snappy/snappy-stubs-public.h
+++ b/other-licenses/snappy/snappy-stubs-public.h
@@ -31,17 +31,17 @@
 //
 // This file cannot include config.h, as it is included from snappy.h,
 // which is a public header. Instead, snappy-stubs-public.h is generated by
 // from snappy-stubs-public.h.in at configure time.
 
 #ifndef UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
 #define UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 #define SNAPPY_MAJOR 1
 #define SNAPPY_MINOR 0
 #define SNAPPY_PATCHLEVEL 4
 #define SNAPPY_VERSION \
     ((SNAPPY_MAJOR << 16) | (SNAPPY_MINOR << 8) | SNAPPY_PATCHLEVEL)
 
 #include <string>
--- a/security/manager/ssl/src/md4.h
+++ b/security/manager/ssl/src/md4.h
@@ -5,17 +5,17 @@
 
 #ifndef md4_h__
 #define md4_h__
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 
 /**
  * md4sum - computes the MD4 sum over the input buffer per RFC 1320
  * 
  * @param input
  *        buffer containing input data
  * @param inputLen
  *        length of input buffer (number of bytes)
--- a/toolkit/mozapps/update/updater/bspatch.h
+++ b/toolkit/mozapps/update/updater/bspatch.h
@@ -27,18 +27,17 @@
  * 2005-04-26 - Define the header as a C structure, add a CRC32 checksum to
  *              the header, and make all the types 32-bit.
  *                --Benjamin Smedberg <benjamin@smedbergs.us>
  */
 
 #ifndef bspatch_h__
 #define bspatch_h__
 
-// We use the NSPR types, but we don't link with NSPR
-#include "prtypes.h"
+#include "mozilla/StandardInteger.h"
 #include <stdio.h>
 
 typedef struct MBSPatchHeader_ {
   /* "MBDIFF10" */
   char tag[8];
   
   /* Length of the file to be patched */
   uint32_t slen;
--- a/widget/nsEvent.h
+++ b/widget/nsEvent.h
@@ -1,16 +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 nsEvent_h__
 #define nsEvent_h__
 
+#include "mozilla/StandardInteger.h"
+
 /*
  * This is in a separate header file because it needs to be included
  * in many places where including nsGUIEvent.h would bring in many
  * header files that are totally unnecessary.
  */
 
 enum UIStateChangeType {
   UIStateChangeType_NoChange,
--- a/xpcom/typelib/xpt/public/xpt_arena.h
+++ b/xpcom/typelib/xpt/public/xpt_arena.h
@@ -7,16 +7,17 @@
  * Simple arena allocator for xpt (which avoids using NSPR).
  */
 
 #ifndef __xpt_arena_h__
 #define __xpt_arena_h__
 
 #include "prtypes.h"
 #include <stdlib.h>
+#include "mozilla/StandardInteger.h"
 
 
 /*
  * The XPT library is statically linked: no functions are exported from
  * shared libraries.
  */
 #define XPT_PUBLIC_API(t)    t
 #define XPT_PUBLIC_DATA(t)   t
--- a/xpcom/typelib/xpt/public/xpt_struct.h
+++ b/xpcom/typelib/xpt/public/xpt_struct.h
@@ -7,16 +7,17 @@
  * Structures matching the in-memory representation of typelib structures.
  * http://www.mozilla.org/scriptable/typelib_file.html
  */
 
 #ifndef __xpt_struct_h__
 #define __xpt_struct_h__
 
 #include "xpt_arena.h"
+#include "mozilla/StandardInteger.h"
 
 PR_BEGIN_EXTERN_C
 
 /*
  * Originally, I was going to have structures that exactly matched the on-disk
  * representation, but that proved difficult: different compilers can pack
  * their structs differently, and that makes overlaying them atop a
  * read-from-disk byte buffer troublesome.  So now I just have some structures