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

This commit is contained in:
Justin Lebar
2012-02-29 22:56:43 -05:00
parent 58bfd1ef2d
commit 6ca96e2ebe
31 changed files with 39 additions and 38 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -40,8 +40,8 @@
/* Implements the C99 <stdint.h> interface for C and C++ code. */ /* Implements the C99 <stdint.h> interface for C and C++ code. */
#ifndef mozilla_StdInt_h_ #ifndef mozilla_StandardInteger_h_
#define mozilla_StdInt_h_ #define mozilla_StandardInteger_h_
/* /*
* The C99 standard header <stdint.h> exposes typedefs for common fixed-width * 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 * 2. Otherwise, if we are compiling with a an MSVC++ version without
* <stdint.h>, #include our custom <stdint.h> reimplementation. * <stdint.h>, #include our custom <stdint.h> reimplementation.
* 3. Otherwise, #include the standard <stdint.h> provided by the compiler. * 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) #if defined(MOZ_CUSTOM_STDINT_H)
# include MOZ_CUSTOM_STDINT_H # include MOZ_CUSTOM_STDINT_H
#elif defined(_MSC_VER) && _MSC_VER < 1600 #elif defined(_MSC_VER) && _MSC_VER < 1600
# include "mozilla/MSStdInt.h" # include "mozilla/MSStdInt.h"
#else #else
/* # include <stdint.h>
* Don't include <stdint.h>, because on some case-insensitive systems . is
* searched for headers before the standard include location. :-(
*/
# include <sys/../stdint.h>
#endif #endif
#endif /* mozilla_StdInt_h_ */ #endif /* mozilla_StandardInteger_h_ */

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -39,7 +39,7 @@
#define __nsCheapSets_h__ #define __nsCheapSets_h__
#include "nsTHashtable.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. * A set that takes up minimal size when there are 0 or 1 entries in the set.