Bug 731789 - Rename mfbt/StdInt.h to mfbt/StandardInteger.h, so stdint types work from cpp files inside mfbt. r=waldo

content/base/public/nsDOMFile.h

@@ -58,7 +58,7 @@
 #include "mozilla/dom/indexedDB/IndexedDatabaseManager.h"
 
 #include "mozilla/GuardObjects.h"
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 class nsIFile;
 class nsIInputStream;

content/base/src/nsDOMBlobBuilder.h

@@ -41,7 +41,7 @@
 #include "nsDOMFile.h"
 #include "CheckedInt.h"
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 using namespace mozilla;
 

content/media/VideoUtils.cpp

@@ -39,7 +39,7 @@
 #include "nsMathUtils.h"
 #include "prtypes.h"
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 // Converts from number of audio frames to microseconds, given the specified
 // audio rate.

content/media/nsBuiltinDecoderReader.cpp

@@ -46,7 +46,7 @@
 #include "VideoUtils.h"
 
 #include "mozilla/mozalloc.h"
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 using namespace mozilla;
 using mozilla::layers::ImageContainer;

content/media/nsBuiltinDecoderStateMachine.cpp

@@ -48,7 +48,7 @@
 #include "nsDeque.h"
 
 #include "mozilla/Preferences.h"
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 #include "mozilla/Util.h"
 
 using namespace mozilla;

content/media/ogg/nsOggCodecState.cpp

@@ -44,7 +44,7 @@
 #include "VideoUtils.h"
 #include "nsBuiltinDecoderReader.h"
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* gBuiltinDecoderLog;

content/media/ogg/nsOggCodecState.h

@@ -51,7 +51,7 @@
 #include <nsClassHashtable.h>
 #include "VideoUtils.h"
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 // Uncomment the following to validate that we're predicting the number
 // of Vorbis samples in each packet correctly.

content/media/wave/nsWaveReader.cpp

@@ -43,7 +43,7 @@
 #include "nsTimeRanges.h"
 #include "VideoUtils.h"
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 using namespace mozilla;
 

content/media/webm/nsWebMReader.h

@@ -39,7 +39,7 @@
 #if !defined(nsWebMReader_h_)
 #define nsWebMReader_h_
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include "nsDeque.h"
 #include "nsBuiltinDecoderReader.h"

gfx/2d/Types.h

@@ -38,7 +38,7 @@
 #ifndef MOZILLA_GFX_TYPES_H_
 #define MOZILLA_GFX_TYPES_H_
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include <stddef.h>
 

gfx/thebes/gfxScriptItemizer.h

@@ -80,7 +80,7 @@
 #ifndef GFX_SCRIPTITEMIZER_H
 #define GFX_SCRIPTITEMIZER_H
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 #include "prtypes.h"
 #include "harfbuzz/hb.h"
 #include "nsUnicodeScriptCodes.h"

gfx/thebes/woff.h

@@ -40,7 +40,7 @@
 
 /* API for the WOFF encoder and decoder */
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include <stdio.h> /* only for FILE, needed for woffPrintStatus */
 

image/src/RasterImage.cpp

@@ -68,7 +68,7 @@
 #include "gfxContext.h"
 
 #include "mozilla/Preferences.h"
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/ClearOnShutdown.h"

intl/unicharutil/src/nsUnicodePropertyData.cpp

@@ -74,7 +74,7 @@ for the Unicode Character Database (UCD) for Unicode 6.1.0.
  * * * * * This file contains MACHINE-GENERATED DATA, do not edit! * * * * *
  */
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 #include "harfbuzz/hb-common.h"
 
 static const PRUint32 sScriptCodeToTag[] = {

intl/unicharutil/tools/genUnicodePropertyData.pl

@@ -376,7 +376,7 @@ $versionInfo
  * * * * * This file contains MACHINE-GENERATED DATA, do not edit! * * * * *
  */
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 #include "harfbuzz/hb-common.h"
 
 __END

js/public/LegacyIntTypes.h

@@ -55,7 +55,7 @@
 #ifndef PROTYPES_H
 #define PROTYPES_H
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include "js-config.h"
 

js/src/jsapi.h

@@ -44,7 +44,7 @@
  * JavaScript API.
  */
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include <stddef.h>
 #include <stdio.h>

js/src/jsfriendapi.cpp

@@ -38,7 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "mozilla/GuardObjects.h"
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include "jscntxt.h"
 #include "jscompartment.h"

js/src/vm/ObjectImpl.h

@@ -9,7 +9,7 @@
 #define ObjectImpl_h___
 
 #include "mozilla/Assertions.h"
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include "jsfriendapi.h"
 #include "jsinfer.h"

js/src/vm/Unicode.h

@@ -39,7 +39,7 @@
 #ifndef Unicode_h__
 #define Unicode_h__
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include "jspubtd.h"
 

js/src/yarr/PageBlock.h

@@ -30,7 +30,7 @@
 #ifndef PageBlock_h
 #define PageBlock_h
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include <stdlib.h>
 #include "assembler/wtf/Platform.h"

media/libcubeb/include/cubeb-stdint.h

@@ -1 +1 @@
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"

mfbt/StandardInteger.h

@@ -40,8 +40,8 @@
 
 /* Implements the C99 <stdint.h> interface for C and C++ code. */
 
-#ifndef mozilla_StdInt_h_
-#define mozilla_StdInt_h_
+#ifndef mozilla_StandardInteger_h_
+#define mozilla_StandardInteger_h_
 
 /*
  * The C99 standard header <stdint.h> exposes typedefs for common fixed-width
@@ -61,17 +61,18 @@
  *   2. Otherwise, if we are compiling with a an MSVC++ version without
  *      <stdint.h>, #include our custom <stdint.h> reimplementation.
  *   3. Otherwise, #include the standard <stdint.h> provided by the compiler.
+ *
+ * Note that we can't call this file "stdint.h" or something case-insensitively
+ * equal to "stdint.h" because then MSVC (and other compilers on
+ * case-insensitive file systems) will include this file, rather than the system
+ * stdint.h, when we ask for <stdint.h> below.
  */
 #if defined(MOZ_CUSTOM_STDINT_H)
 #  include MOZ_CUSTOM_STDINT_H
 #elif defined(_MSC_VER) && _MSC_VER < 1600
 #  include "mozilla/MSStdInt.h"
 #else
-   /*
-    * Don't include <stdint.h>, because on some case-insensitive systems . is
-    * searched for headers before the standard include location.  :-(
-    */
-#  include <sys/../stdint.h>
+#  include <stdint.h>
 #endif
 
-#endif  /* mozilla_StdInt_h_ */
+#endif  /* mozilla_StandardInteger_h_ */

mfbt/Types.h

@@ -53,7 +53,7 @@
  * the right __STDC_*_MACRO has been defined for each).  These are all usable
  * throughout mfbt code, and throughout Mozilla code more generally.
  */
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 /* Also expose size_t. */
 #include <stddef.h>

mfbt/exported_headers.mk

@@ -51,7 +51,7 @@ EXPORTS_mozilla += \
   MSStdInt.h \
   RangedPtr.h \
   RefPtr.h \
-  StdInt.h \
+  StandardInteger.h \
   Types.h \
   Util.h \
   $(NULL)

tools/profiler/platform.h

@@ -8,7 +8,7 @@
 #define __android_log_print(a, ...)
 #endif
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 #include "mozilla/Util.h"
 #include "mozilla/unused.h"
 #include "mozilla/TimeStamp.h"

tools/profiler/shared-libraries.h

@@ -39,7 +39,7 @@
 #include <vector>
 #include <string.h>
 #include <stdlib.h>
-#include <mozilla/StdInt.h>
+#include <mozilla/StandardInteger.h>
 
 class SharedLibrary {
 public:

tools/trace-malloc/lib/nsTraceMalloc.h

@@ -40,7 +40,7 @@
 #ifndef nsTraceMalloc_h___
 #define nsTraceMalloc_h___
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 #include <stdio.h> /* for FILE */
 #include "prtypes.h"

xpcom/base/nsStackWalk.h

@@ -43,7 +43,7 @@
 /* WARNING: This file is intended to be included from C or C++ files. */
 
 #include "nscore.h"
-#include <mozilla/StdInt.h>
+#include <mozilla/StandardInteger.h>
 
 PR_BEGIN_EXTERN_C
 

xpcom/build/nsXREAppData.h

@@ -40,7 +40,7 @@
 #ifndef nsXREAppData_h
 #define nsXREAppData_h
 
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 class nsILocalFile;
 

xpcom/ds/nsCheapSets.h

@@ -39,7 +39,7 @@
 #define __nsCheapSets_h__
 
 #include "nsTHashtable.h"
-#include "mozilla/StdInt.h"
+#include "mozilla/StandardInteger.h"
 
 /**
  * A set that takes up minimal size when there are 0 or 1 entries in the set.