Bug 872127 - Part 2: Replace mozilla/StandardInteger.h with stdint.h; r=Waldo,ted

2024-09-13 09:24:08 -07:00 · 2013-07-30 10:25:31 -04:00 · 2013-07-30 10:25:31 -04:00 · 3717325909
commit 3717325909
parent a70b435251
147 changed files with 164 additions and 214 deletions
--- a/accessible/src/base/ARIAStateMap.h
+++ b/accessible/src/base/ARIAStateMap.h
@ -7,7 +7,7 @@
 #ifndef _mozilla_a11y_aria_ARIAStateMap_h_
 #define _mozilla_a11y_aria_ARIAStateMap_h_

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 namespace mozilla {

--- a/accessible/src/base/Filters.h
+++ b/accessible/src/base/Filters.h
@ -5,7 +5,7 @@
 #ifndef mozilla_a11y_Filters_h__
 #define mozilla_a11y_Filters_h__

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 /**
 * Predefined filters used for nsAccIterator and nsAccCollector.
--- a/accessible/src/base/States.h
+++ b/accessible/src/base/States.h
@ -7,7 +7,7 @@
 #ifndef _states_h_
 #define _states_h_

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 namespace mozilla {
 namespace a11y {
--- a/accessible/src/generic/TableCellAccessible.h
+++ b/accessible/src/generic/TableCellAccessible.h
@ -8,7 +8,7 @@
 #define mozilla_a11y_TableCellAccessible_h__

 #include "nsTArray.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 namespace mozilla {
 namespace a11y {
--- a/accessible/src/windows/msaa/Compatibility.h
+++ b/accessible/src/windows/msaa/Compatibility.h
@ -7,7 +7,7 @@
 #ifndef COMPATIBILITY_MANAGER_H
 #define COMPATIBILITY_MANAGER_H

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 namespace mozilla {
 namespace a11y {
--- a/caps/include/nsScriptSecurityManager.h
+++ b/caps/include/nsScriptSecurityManager.h
@ -21,7 +21,7 @@
 #include "plstr.h"
 #include "nsIScriptExternalNameSet.h"

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 class nsIDocShell;
 class nsString;
--- a/caps/src/nsScriptSecurityManager.cpp
+++ b/caps/src/nsScriptSecurityManager.cpp
@ -57,7 +57,7 @@
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/BindingUtils.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/StaticPtr.h"
 #include "nsContentUtils.h"
--- a/configure.in
+++ b/configure.in
@ -6058,7 +6058,6 @@ if test -n "$MOZ_CRASHREPORTER"; then
    fi
  fi
 fi
-AC_DEFINE_UNQUOTED(BREAKPAD_CUSTOM_STDINT_H, "mozilla/StandardInteger.h")

 MOZ_ARG_WITH_STRING(crashreporter-enable-percent,
 [  --with-crashreporter-enable-percent=NN
--- a/content/base/public/nsDOMFile.h
+++ b/content/base/public/nsDOMFile.h
@ -24,7 +24,7 @@

 #include "mozilla/GuardObjects.h"
 #include "mozilla/LinkedList.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/dom/DOMError.h"
--- a/content/base/public/nsViewportInfo.h
+++ b/content/base/public/nsViewportInfo.h
@ -5,7 +5,7 @@
 #ifndef nsViewportInfo_h___
 #define nsViewportInfo_h___

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nscore.h"

 /**
--- a/content/base/src/nsAtomListUtils.h
+++ b/content/base/src/nsAtomListUtils.h
@ -10,7 +10,7 @@
 #ifndef nsAtomListUtils_h__
 #define nsAtomListUtils_h__

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 class nsIAtom;
 struct nsStaticAtom;
--- a/content/base/src/nsAttrValueInlines.h
+++ b/content/base/src/nsAttrValueInlines.h
@ -5,7 +5,7 @@
 #ifndef nsAttrValueInlines_h__
 #define nsAttrValueInlines_h__

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 struct MiscContainer
 {
--- a/content/base/src/nsContentListDeclarations.h
+++ b/content/base/src/nsContentListDeclarations.h
@ -6,7 +6,7 @@
 #ifndef nsContentListDeclarations_h
 #define nsContentListDeclarations_h

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nsCOMPtr.h"
 #include "nsStringGlue.h"

--- a/content/base/src/nsTextFragmentImpl.h
+++ b/content/base/src/nsTextFragmentImpl.h
@ -6,7 +6,7 @@
 #ifndef nsTextFragmentImpl_h__
 #define nsTextFragmentImpl_h__

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 template<size_t size> struct Non8BitParameters;
 template<> struct Non8BitParameters<4> {
--- a/content/canvas/src/ImageData.h
+++ b/content/canvas/src/ImageData.h
@ -10,7 +10,7 @@
 #include "nsIDOMCanvasRenderingContext2D.h"

 #include "mozilla/Attributes.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 #include "nsCycleCollectionParticipant.h"
 #include "nsTraceRefcnt.h"
--- a/content/canvas/src/WebGLElementArrayCache.h
+++ b/content/canvas/src/WebGLElementArrayCache.h
@ -7,7 +7,7 @@
 #define WEBGLELEMENTARRAYCACHE_H

 #include "mozilla/MemoryReporting.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nscore.h"
 #include "GLDefs.h"

--- a/content/canvas/src/WebGLTexelConversions.h
+++ b/content/canvas/src/WebGLTexelConversions.h
@ -33,7 +33,7 @@
 #endif

 #include "WebGLTypes.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 #if defined _MSC_VER
 #define FORCE_INLINE __forceinline
--- a/content/media/MediaDecoderReader.cpp
+++ b/content/media/MediaDecoderReader.cpp
@ -12,7 +12,7 @@
 #include "ImageContainer.h"

 #include "mozilla/mozalloc.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include <algorithm>

 namespace mozilla {
--- a/content/media/MediaDecoderStateMachine.cpp
+++ b/content/media/MediaDecoderStateMachine.cpp
@ -10,7 +10,7 @@
 #endif
 
 #include "mozilla/DebugOnly.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Util.h"

 #include "MediaDecoderStateMachine.h"
--- a/content/media/VideoUtils.cpp
+++ b/content/media/VideoUtils.cpp
@ -7,7 +7,7 @@
 #include "mozilla/dom/TimeRanges.h"
 #include "nsMathUtils.h"

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 // Converts from number of audio frames to microseconds, given the specified
 // audio rate.
--- a/content/media/ogg/OggCodecState.cpp
+++ b/content/media/ogg/OggCodecState.cpp
@ -7,7 +7,7 @@
 #include <string.h>

 #include "mozilla/DebugOnly.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 #include "nsDebug.h"
 #include "MediaDecoderReader.h"
--- a/content/media/ogg/OggCodecState.h
+++ b/content/media/ogg/OggCodecState.h
@ -27,7 +27,7 @@
 #include <nsClassHashtable.h>
 #include "VideoUtils.h"

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 // Uncomment the following to validate that we're predicting the number
 // of Vorbis samples in each packet correctly.
--- a/content/media/wave/WaveReader.cpp
+++ b/content/media/wave/WaveReader.cpp
@ -11,7 +11,7 @@
 #include "MediaDecoderStateMachine.h"
 #include "VideoUtils.h"

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Util.h"
 #include "mozilla/CheckedInt.h"
 #include <algorithm>
--- a/content/media/webm/WebMReader.h
+++ b/content/media/webm/WebMReader.h
@ -6,7 +6,7 @@
 #if !defined(WebMReader_h_)
 #define WebMReader_h_

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 #include "nsDeque.h"
 #include "MediaDecoderReader.h"
--- a/content/media/wmf/WMFUtils.cpp
+++ b/content/media/wmf/WMFUtils.cpp
@ -5,7 +5,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "WMFUtils.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/RefPtr.h"
 #include "prlog.h"
 #include "nsThreadUtils.h"
--- a/content/smil/nsSMILKeySpline.cpp
+++ b/content/smil/nsSMILKeySpline.cpp
@ -4,7 +4,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsSMILKeySpline.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include <math.h>

 #define NEWTON_ITERATIONS          4
--- a/content/smil/nsSMILTypes.h
+++ b/content/smil/nsSMILTypes.h
@ -6,7 +6,7 @@
 #ifndef NS_SMILTYPES_H_
 #define NS_SMILTYPES_H_

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 // A timestamp in milliseconds
 //
--- a/content/svg/content/src/SVGSVGElement.cpp
+++ b/content/svg/content/src/SVGSVGElement.cpp
@ -3,7 +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 "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Util.h"
 #include "mozilla/Likely.h"

--- a/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
+++ b/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
@ -22,7 +22,7 @@
 #include "nsAttrName.h"
 #include "nsTArray.h"
 #include "mozilla/dom/Element.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include <algorithm>

 const uint32_t kUnknownIndex = uint32_t(-1);
--- a/dom/base/nsDOMWindowList.h
+++ b/dom/base/nsDOMWindowList.h
@ -9,7 +9,7 @@
 #include "nsISupports.h"
 #include "nsIDOMWindowCollection.h"
 #include "nsString.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 class nsIDocShellTreeNode;
 class nsIDocShell;
--- a/dom/gamepad/Gamepad.h
+++ b/dom/gamepad/Gamepad.h
@ -6,7 +6,7 @@
 #define mozilla_dom_gamepad_Gamepad_h

 #include "mozilla/ErrorResult.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nsCOMPtr.h"
 #include "nsIDOMGamepad.h"
 #include "nsIVariant.h"
--- a/dom/gamepad/GamepadService.h
+++ b/dom/gamepad/GamepadService.h
@ -5,7 +5,7 @@
 #ifndef mozilla_dom_GamepadService_h_
 #define mozilla_dom_GamepadService_h_

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "Gamepad.h"
 #include "nsAutoPtr.h"
 #include "nsCOMArray.h"
--- a/dom/plugins/base/nsNPAPIPluginStreamListener.cpp
+++ b/dom/plugins/base/nsNPAPIPluginStreamListener.cpp
@ -15,7 +15,7 @@
 #include "nsPluginLogging.h"
 #include "nsPluginStreamListenerPeer.h"

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include <algorithm>

 nsNPAPIStreamWrapper::nsNPAPIStreamWrapper(nsIOutputStream *outputStream,
--- a/dom/plugins/ipc/PluginInstanceParent.cpp
+++ b/dom/plugins/ipc/PluginInstanceParent.cpp
@ -5,7 +5,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "mozilla/DebugOnly.h"
-#include "mozilla/StandardInteger.h" // for intptr_t
+#include <stdint.h> // for intptr_t

 #include "PluginInstanceParent.h"
 #include "BrowserStreamParent.h"
--- a/dom/plugins/test/testplugin/nptest.h
+++ b/dom/plugins/test/testplugin/nptest.h
@ -39,7 +39,7 @@
 #include "npapi.h"
 #include "npfunctions.h"
 #include "npruntime.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include <string>
 #include <sstream>

--- a/dom/system/gonk/AutoMounter.h
+++ b/dom/system/gonk/AutoMounter.h
@ -5,7 +5,7 @@
 #ifndef mozilla_system_automounter_h__
 #define mozilla_system_automounter_h__

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 class nsCString;

--- a/dom/workers/Workers.h
+++ b/dom/workers/Workers.h
@ -9,7 +9,7 @@
 #include "jsapi.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Mutex.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsDebug.h"
--- a/gfx/2d/Types.h
+++ b/gfx/2d/Types.h
@ -6,10 +6,10 @@
 #ifndef MOZILLA_GFX_TYPES_H_
 #define MOZILLA_GFX_TYPES_H_

-#include "mozilla/StandardInteger.h"
 #include "mozilla/NullPtr.h"

 #include <stddef.h>
+#include <stdint.h>

 namespace mozilla {
 namespace gfx {
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@ -52,7 +52,7 @@ typedef char realGLboolean;

 #include "mozilla/mozalloc.h"
 #include "mozilla/Preferences.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Mutex.h"
 #include "mozilla/GenericRefCounted.h"

--- a/gfx/gl/GLContextUtils.cpp
+++ b/gfx/gl/GLContextUtils.cpp
@ -7,7 +7,7 @@

 #include "mozilla/Preferences.h"
 #include "mozilla/Assertions.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 using namespace mozilla::gfx;

--- a/gfx/gl/GLDefs.h
+++ b/gfx/gl/GLDefs.h
@ -37,7 +37,7 @@ typedef ptrdiff_t GLintptr;

 #endif /* #if !defined(__gltypes_h_) && !defined(__gl_h_) */

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 // ARB_sync
 typedef struct __GLsync* GLsync;
--- a/gfx/gl/SharedSurface.h
+++ b/gfx/gl/SharedSurface.h
@ -15,7 +15,7 @@
 #ifndef SHARED_SURFACE_H_
 #define SHARED_SURFACE_H_

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Attributes.h"
 #include "GLDefs.h"
 #include "gfxPoint.h"
--- a/gfx/gl/SurfaceTypes.h
+++ b/gfx/gl/SurfaceTypes.h
@ -7,7 +7,7 @@
 #define SURFACE_TYPES_H_

 #include "mozilla/TypedEnum.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 #include <cstring>

--- a/gfx/layers/ImageDataSerializer.h
+++ b/gfx/layers/ImageDataSerializer.h
@ -8,10 +8,11 @@
 #ifndef GFX_LAYERS_BLOBSURFACE_H
 #define GFX_LAYERS_BLOBSURFACE_H

-#include "mozilla/StandardInteger.h"
 #include "mozilla/gfx/Point.h"
 #include "mozilla/RefPtr.h"

+#include <stdint.h>
+
 class gfxImageSurface;

 namespace mozilla {
--- a/gfx/layers/client/TextureClient.cpp
+++ b/gfx/layers/client/TextureClient.cpp
@ -16,10 +16,11 @@
 #include "mozilla/layers/YCbCrImageDataSerializer.h"
 #include "gfxReusableSurfaceWrapper.h"
 #include "gfxPlatform.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/layers/ImageDataSerializer.h"
 #include "gfx2DGlue.h"

+#include <stdint.h>
+
 using namespace mozilla::gl;

 namespace mozilla {
--- a/gfx/layers/ipc/CompositableForwarder.h
+++ b/gfx/layers/ipc/CompositableForwarder.h
@ -7,7 +7,7 @@
 #ifndef MOZILLA_LAYERS_COMPOSITABLEFORWARDER
 #define MOZILLA_LAYERS_COMPOSITABLEFORWARDER

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "gfxASurface.h"
 #include "GLDefs.h"
 #include "mozilla/layers/ISurfaceAllocator.h"
--- a/gfx/qcms/qcmstypes.h
+++ b/gfx/qcms/qcmstypes.h
@ -4,10 +4,9 @@
 #ifdef MOZ_QCMS

 #include "prtypes.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
-/* StandardInteger.h defines int*_t and uintptr_t */

 #if defined(_AIX)
 #include <sys/types.h>
--- a/gfx/thebes/gfxScriptItemizer.h
+++ b/gfx/thebes/gfxScriptItemizer.h
@ -50,7 +50,7 @@
 #ifndef GFX_SCRIPTITEMIZER_H
 #define GFX_SCRIPTITEMIZER_H

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "prtypes.h"
 #include "harfbuzz/hb.h"
 #include "nsUnicodeScriptCodes.h"
--- a/gfx/ycbcr/chromium_types.h
+++ b/gfx/ycbcr/chromium_types.h
@ -5,7 +5,7 @@
 #ifndef GFX_CHROMIUMTYPES_H
 #define GFX_CHROMIUMTYPES_H

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 // On Windows, protypes.h is #included, which defines these types.  This sucks!
 #ifndef PROTYPES_H
--- a/image/src/ImageMetadata.h
+++ b/image/src/ImageMetadata.h
@ -4,7 +4,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 "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Util.h"
 #include "nsSize.h"

--- a/image/src/RasterImage.cpp
+++ b/image/src/RasterImage.cpp
@ -38,7 +38,7 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Services.h"
 #include "mozilla/Preferences.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Telemetry.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/ClearOnShutdown.h"
--- a/intl/uconv/tools/umaptable.c
+++ b/intl/uconv/tools/umaptable.c
@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 #define NOMAPPING 0xfffd

--- a/intl/uconv/util/ubase.h
+++ b/intl/uconv/util/ubase.h
@ -6,7 +6,7 @@
 #define ubase_h__

 #include "prtypes.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 #define PRIVATE 
 #define MODULE_PRIVATE
--- a/intl/unicharutil/tools/genUnicodePropertyData.pl
+++ b/intl/unicharutil/tools/genUnicodePropertyData.pl
@ -623,7 +623,7 @@ $versionInfo
 * * * * * This file contains MACHINE-GENERATED DATA, do not edit! * * * * *
 */

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "harfbuzz/hb.h"

 __END
--- a/intl/unicharutil/util/nsSpecialCasingData.h
+++ b/intl/unicharutil/util/nsSpecialCasingData.h
@ -3,7 +3,7 @@
 * You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "prtypes.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 namespace mozilla {
 namespace unicode {
--- a/intl/unicharutil/util/nsUnicodePropertyData.cpp
+++ b/intl/unicharutil/util/nsUnicodePropertyData.cpp
@ -54,7 +54,7 @@ for the Unicode Character Database (UCD) for Unicode 6.2.0.
 * * * * * This file contains MACHINE-GENERATED DATA, do not edit! * * * * *
 */

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "harfbuzz/hb.h"

 static const uint32_t sScriptCodeToTag[] = {
--- a/ipc/chromium/src/base/basictypes.h
+++ b/ipc/chromium/src/base/basictypes.h
@ -12,7 +12,7 @@
 #include "base/port.h"    // Types that only need exist on certain systems

 #include "mozilla/Assertions.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 // A type to represent a Unicode code-point value. As of Unicode 4.0,
 // such values require up to 21 bits.
--- a/ipc/glue/IPCMessageUtils.h
+++ b/ipc/glue/IPCMessageUtils.h
@ -17,7 +17,8 @@
 #include "mozilla/Util.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/Point.h"
-#include "mozilla/StandardInteger.h"
+
+#include <stdint.h>

 #include "nsID.h"
 #include "nsMemory.h"
--- a/js/src/ctypes/CTypes.cpp
+++ b/js/src/ctypes/CTypes.cpp
@ -8,10 +8,10 @@

 #include "mozilla/FloatingPoint.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/StandardInteger.h"

 #include <limits>
 #include <math.h>
+#include <stdint.h>

 #if defined(XP_WIN) || defined(XP_OS2)
 #include <float.h>
--- a/js/src/gc/Heap.h
+++ b/js/src/gc/Heap.h
@ -9,9 +9,9 @@

 #include "mozilla/Attributes.h"
 #include "mozilla/PodOperations.h"
-#include "mozilla/StandardInteger.h"

 #include <stddef.h>
+#include <stdint.h>

 #include "jspubtd.h"
 #include "jstypes.h"
--- a/js/src/ion/arm/Architecture-arm.cpp
+++ b/js/src/ion/arm/Architecture-arm.cpp
@ -6,8 +6,6 @@

 #include "ion/arm/Architecture-arm.h"

-#include "mozilla/StandardInteger.h"
-
 #include <elf.h>
 #include <fcntl.h>
 #include <sys/stat.h>
--- a/js/src/ion/arm/Architecture-arm.h
+++ b/js/src/ion/arm/Architecture-arm.h
@ -7,9 +7,8 @@
 #ifndef ion_arm_Architecture_arm_h
 #define ion_arm_Architecture_arm_h

-#include "mozilla/StandardInteger.h"
-
 #include <limits.h>
+#include <stdint.h>

 // gcc appears to use __ARM_PCS_VFP to denote that the target is a hard-float target.
 #ifdef __ARM_PCS_VFP
--- a/js/src/ion/shared/IonFrames-x86-shared.h
+++ b/js/src/ion/shared/IonFrames-x86-shared.h
@ -7,7 +7,7 @@
 #ifndef ion_shared_IonFrames_x86_shared_h
 #define ion_shared_IonFrames_x86_shared_h

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 #include "ion/shared/IonFrames-shared.h"

--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@ -12,11 +12,11 @@
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/RangedPtr.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/ThreadLocal.h"

 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>

 #include "js-config.h"
--- a/js/src/jscrashreport.h
+++ b/js/src/jscrashreport.h
@ -8,7 +8,8 @@
 #define jscrashreport_h

 #include "mozilla/GuardObjects.h"
-#include "mozilla/StandardInteger.h"
+
+#include <stdint.h>

 namespace js {
 namespace crash {
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@ -7,7 +7,8 @@
 #include "jsfriendapi.h"

 #include "mozilla/PodOperations.h"
-#include "mozilla/StandardInteger.h"
+
+#include <stdint.h>

 #include "jscntxt.h"
 #include "jscompartment.h"
--- a/js/src/prmjtime.h
+++ b/js/src/prmjtime.h
@ -7,8 +7,7 @@
 #ifndef prmjtime_h
 #define prmjtime_h

-#include "mozilla/StandardInteger.h"
-
+#include <stdint.h>
 #include <time.h>

 /*
--- a/js/src/vm/DateTime.h
+++ b/js/src/vm/DateTime.h
@ -9,7 +9,8 @@

 #include "mozilla/FloatingPoint.h"
 #include "mozilla/MathAlgorithms.h"
-#include "mozilla/StandardInteger.h"
+
+#include <stdint.h>

 #include "vm/NumericConversions.h"

--- a/js/src/vm/ObjectImpl.h
+++ b/js/src/vm/ObjectImpl.h
@ -9,7 +9,8 @@

 #include "mozilla/Assertions.h"
 #include "mozilla/GuardObjects.h"
-#include "mozilla/StandardInteger.h"
+
+#include <stdint.h>

 #include "jsfriendapi.h"
 #include "jsinfer.h"
--- a/js/src/vm/ThreadPool.h
+++ b/js/src/vm/ThreadPool.h
@ -7,9 +7,8 @@
 #ifndef vm_ThreadPool_h
 #define vm_ThreadPool_h

-#include "mozilla/StandardInteger.h"
-
 #include <stddef.h>
+#include <stdint.h>

 #include "jsalloc.h"
 #ifdef JS_THREADSAFE
--- a/js/src/yarr/CheckedArithmetic.h
+++ b/js/src/yarr/CheckedArithmetic.h
@ -31,7 +31,7 @@
 #include "assembler/wtf/Assertions.h"

 #include <limits>
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/TypeTraits.h"

 #ifdef _MSC_VER
--- a/js/src/yarr/PageBlock.h
+++ b/js/src/yarr/PageBlock.h
@ -30,9 +30,8 @@
 #ifndef yarr_PageBlock_h
 #define yarr_PageBlock_h

-#include "mozilla/StandardInteger.h"
-
 #include <stddef.h>
+#include <stdint.h>

 namespace WTF {

--- a/js/src/yarr/YarrCanonicalizeUCS2.h
+++ b/js/src/yarr/YarrCanonicalizeUCS2.h
@ -28,7 +28,7 @@
 #ifndef yarr_YarrCanonicalizeUCS2_h
 #define yarr_YarrCanonicalizeUCS2_h

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 #include "yarr/wtfbridge.h"

--- a/js/xpconnect/src/XPCWrappedNative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@ -22,7 +22,7 @@
 #include "nsContentUtils.h"
 #include "nsCxPusher.h"

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Util.h"
 #include "mozilla/Likely.h"
 #include <algorithm>
--- a/js/xpconnect/src/xpcObjectHelper.h
+++ b/js/xpconnect/src/xpcObjectHelper.h
@ -13,7 +13,7 @@
 #endif

 #include "mozilla/Attributes.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsIClassInfo.h"
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@ -78,13 +78,14 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/Util.h"

-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
 #include <math.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "xpcpublic.h"
 #include "jsapi.h"
 #include "jsprf.h"
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@ -51,7 +51,7 @@
 #include "ImageContainer.h"
 #include "nsCanvasFrame.h"

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include <algorithm>

 using namespace mozilla;
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@ -28,7 +28,7 @@
 #include "nsDisplayListInvalidation.h"
 #include "DisplayListClipState.h"

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 #include <stdlib.h>
 #include <algorithm>
--- a/layout/base/nsPresArena.h
+++ b/layout/base/nsPresArena.h
@ -12,7 +12,7 @@

 #include "mozilla/MemoryChecking.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "nscore.h"
 #include "nsQueryFrame.h"
 #include "nsTArray.h"
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@ -44,7 +44,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/LookAndFeel.h"
 #include "mozilla/dom/Element.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 #include "mozilla/Util.h"
 #include "mozilla/MathAlgorithms.h"
 #include "FrameLayerBuilder.h"
--- a/layout/style/nsRuleData.cpp
+++ b/layout/style/nsRuleData.cpp
@ -6,7 +6,7 @@
 #include "nsRuleData.h"

 #include "mozilla/Poison.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 inline size_t
 nsRuleData::GetPoisonOffset()
--- a/layout/style/nsRuleNode.h
+++ b/layout/style/nsRuleNode.h
@ -14,7 +14,7 @@
 #include "nsPresContext.h"
 #include "nsStyleStruct.h"

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 class nsStyleContext;
 struct nsRuleData;
--- a/layout/tables/celldata.h
+++ b/layout/tables/celldata.h
@ -8,7 +8,7 @@
 #include "nsISupports.h"
 #include "nsCoord.h"
 #include "mozilla/gfx/Types.h"
-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 class nsTableCellFrame;
 class nsCellMap;
--- a/media/libcubeb/include/cubeb-stdint.h
+++ b/media/libcubeb/include/cubeb-stdint.h
@ -2,4 +2,4 @@
 * 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/StandardInteger.h"
+#include <stdint.h>
--- a/media/libjpeg/jmorecfg.h
+++ b/media/libjpeg/jmorecfg.h
@ -12,7 +12,7 @@
 * optimizations.  Most users will not need to touch this file.
 */

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>

 /*
 * Define BITS_IN_JSAMPLE as either
--- a/media/libjpeg/mozilla.diff
+++ b/media/libjpeg/mozilla.diff
@ -62,7 +62,7 @@ diff -up8 jmorecfg.h jmorecfg.h
  * optimizations.  Most users will not need to touch this file.
  */
 
-+#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 
 /*
  * Define BITS_IN_JSAMPLE as either
--- a/media/mtransport/objs.mk
+++ b/media/mtransport/objs.mk
@ -56,7 +56,6 @@ DEFINES += -DWIN
 endif

 DEFINES += \
-   -DR_PLATFORM_INT_TYPES='"mozilla/StandardInteger.h"' \
   -DR_DEFINED_INT2=int16_t -DR_DEFINED_UINT2=uint16_t \
   -DR_DEFINED_INT4=int32_t -DR_DEFINED_UINT4=uint32_t \
   -DR_DEFINED_INT8=int64_t -DR_DEFINED_UINT8=uint64_t \
--- a/media/mtransport/third_party/nICEr/nicer.gyp
+++ b/media/mtransport/third_party/nICEr/nicer.gyp
@ -124,7 +124,7 @@
              'USE_TURN',
              'NR_SOCKET_IS_VOID_PTR',
              'restrict=',
-	      'R_PLATFORM_INT_TYPES=\'"mozilla/StandardInteger.h"\'',
+	      'R_PLATFORM_INT_TYPES=\'<stdint.h>\'',
 	      'R_DEFINED_INT2=int16_t',
 	      'R_DEFINED_UINT2=uint16_t',
 	      'R_DEFINED_INT4=int32_t',
--- a/media/mtransport/third_party/nrappkit/nrappkit.gyp
+++ b/media/mtransport/third_party/nrappkit/nrappkit.gyp
@ -137,7 +137,7 @@
          
          'defines' : [
              'SANITY_CHECKS',
-	      'R_PLATFORM_INT_TYPES=\'"mozilla/StandardInteger.h"\'',
+	      'R_PLATFORM_INT_TYPES=\'<stdint.h>\'',
 	      'R_DEFINED_INT2=int16_t',
 	      'R_DEFINED_UINT2=uint16_t',
 	      'R_DEFINED_INT4=int32_t',
--- a/media/webrtc/signaling/signaling.gyp
+++ b/media/webrtc/signaling/signaling.gyp
@ -168,8 +168,8 @@
        'WEBRTC_RELATIVE_PATH',
      	'HAVE_WEBRTC_VIDEO',
        'HAVE_WEBRTC_VOICE',
+        'HAVE_STDINT_H=1',
        'HAVE_STDLIB_H=1',
-        'INTEGER_TYPES_H="\\"mozilla/StandardInteger.h\\""',
        'HAVE_UINT8_T=1',
        'HAVE_UINT16_T=1',
        'HAVE_UINT32_T=1',
@ -222,8 +222,7 @@
            'WIN32',
            'GIPS_VER=3480',
            'SIPCC_BUILD',
-            'HAVE_WINSOCK2_H',
-            'CPR_STDINT_INCLUDE=\\"mozilla/StandardInteger.h\\"'
+            'HAVE_WINSOCK2_H'
          ],

          'cflags_mozilla': [
--- a/media/webrtc/trunk/third_party/libyuv/include/libyuv/basic_types.h
+++ b/media/webrtc/trunk/third_party/libyuv/include/libyuv/basic_types.h
@ -17,7 +17,7 @@
 #include <stdint.h>  // for uintptr_t
 #endif

-#include "mozilla/StandardInteger.h"
+#include <stdint.h>
 typedef uint64_t uint64;
 typedef int64_t  int64;
 #if defined(_MSC_VER)
--- a/mfbt/BloomFilter.h
+++ b/mfbt/BloomFilter.h
@ -16,9 +16,9 @@

 #include "mozilla/Assertions.h"
 #include "mozilla/Likely.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/Util.h"

+#include <stdint.h>
 #include <string.h>

 namespace mozilla {
--- a/mfbt/CheckedInt.h
+++ b/mfbt/CheckedInt.h
@ -12,12 +12,12 @@
 // Enable relying of Mozilla's MFBT for possibly-available C++11 features
 #define MOZ_CHECKEDINT_USE_MFBT

+#include <stdint.h>
+
 #ifdef MOZ_CHECKEDINT_USE_MFBT
 #  include "mozilla/Assertions.h"
-#  include "mozilla/StandardInteger.h"
 #else
 #  include <cassert>
-#  include <stdint.h>
 #  define MOZ_STATIC_ASSERT(cond, reason) assert((cond) && reason)
 #  define MOZ_ASSERT(cond, reason) assert((cond) && reason)
 #  define MOZ_DELETE
--- a/mfbt/Endian.h
+++ b/mfbt/Endian.h
@ -67,9 +67,9 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/Compiler.h"
 #include "mozilla/DebugOnly.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/TypeTraits.h"

+#include <stdint.h>
 #include <string.h>

 #if defined(_MSC_VER) && _MSC_VER >= 1300
--- a/mfbt/EnumSet.h
+++ b/mfbt/EnumSet.h
@ -10,7 +10,8 @@
 #define mozilla_EnumSet_h

 #include "mozilla/Assertions.h"
-#include "mozilla/StandardInteger.h"
+
+#include <stdint.h>

 namespace mozilla {

--- a/mfbt/FloatingPoint.h
+++ b/mfbt/FloatingPoint.h
@ -12,7 +12,8 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Casting.h"
-#include "mozilla/StandardInteger.h"
+
+#include <stdint.h>

 namespace mozilla {

--- a/mfbt/HashFunctions.h
+++ b/mfbt/HashFunctions.h
@ -48,9 +48,10 @@

 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/Types.h"

+#include <stdint.h>
+
 #ifdef __cplusplus
 namespace mozilla {

--- a/mfbt/MathAlgorithms.h
+++ b/mfbt/MathAlgorithms.h
@ -10,11 +10,11 @@
 #define mozilla_MathAlgorithms_h

 #include "mozilla/Assertions.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/TypeTraits.h"

 #include <cmath>
 #include <limits.h>
+#include <stdint.h>

 namespace mozilla {

--- a/mfbt/Poison.h
+++ b/mfbt/Poison.h
@ -13,9 +13,10 @@
 #define mozilla_Poison_h

 #include "mozilla/Assertions.h"
-#include "mozilla/StandardInteger.h"
 #include "mozilla/Types.h"

+#include <stdint.h>
+
 MOZ_BEGIN_EXTERN_C

 extern MFBT_DATA uintptr_t gMozillaPoisonValue;
--- a/mfbt/SHA1.h
+++ b/mfbt/SHA1.h
@ -9,10 +9,10 @@
 #ifndef mozilla_SHA1_h
 #define mozilla_SHA1_h

-#include "mozilla/StandardInteger.h"
 #include "mozilla/Types.h"

 #include <stddef.h>
+#include <stdint.h>

 namespace mozilla {

--- a/Show More
+++ b/Show More