Fix compilation errors on OS X
This commit is contained in:
parent
4503aafe64
commit
5fae63a2f5
93 changed files with 242 additions and 317 deletions
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "chrome/common/print_messages.h"
|
||||
|
||||
#include "base/basictypes.h"
|
||||
#include "base/strings/string16.h"
|
||||
#include "ui/gfx/geometry/size.h"
|
||||
|
||||
|
|
|
@ -161,7 +161,7 @@ IPC_STRUCT_BEGIN(PrintHostMsg_DidPrintPage_Params)
|
|||
IPC_STRUCT_MEMBER(base::SharedMemoryHandle, metafile_data_handle)
|
||||
|
||||
// Size of the metafile data.
|
||||
IPC_STRUCT_MEMBER(uint32, data_size)
|
||||
IPC_STRUCT_MEMBER(uint32_t, data_size)
|
||||
|
||||
// Cookie for the document to ensure correctness.
|
||||
IPC_STRUCT_MEMBER(int, document_cookie)
|
||||
|
@ -193,7 +193,7 @@ IPC_STRUCT_BEGIN(PrintHostMsg_DidPreviewDocument_Params)
|
|||
IPC_STRUCT_MEMBER(base::SharedMemoryHandle, metafile_data_handle)
|
||||
|
||||
// Size of metafile data.
|
||||
IPC_STRUCT_MEMBER(uint32, data_size)
|
||||
IPC_STRUCT_MEMBER(uint32_t, data_size)
|
||||
|
||||
// Cookie for the document to ensure correctness.
|
||||
IPC_STRUCT_MEMBER(int, document_cookie)
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#include <vector>
|
||||
|
||||
#include "base/basictypes.h"
|
||||
#include "base/macros.h"
|
||||
#include "base/strings/string16.h"
|
||||
|
||||
struct TtsUtteranceRequest {
|
||||
|
@ -41,4 +41,4 @@ struct TtsUtteranceResponse {
|
|||
int id;
|
||||
};
|
||||
|
||||
#endif // CHROME_COMMON_TTS_UTTERANCE_REQUEST_H_
|
||||
#endif // CHROME_COMMON_TTS_UTTERANCE_REQUEST_H_
|
||||
|
|
|
@ -12,5 +12,5 @@ const base::FilePath::CharType kWidevineCdmBaseDirectory[] =
|
|||
|
||||
const char kWidevineCdmPluginExtension[] = "";
|
||||
|
||||
const int32 kWidevineCdmPluginPermissions = ppapi::PERMISSION_DEV |
|
||||
ppapi::PERMISSION_PRIVATE;
|
||||
const int32_t kWidevineCdmPluginPermissions = ppapi::PERMISSION_DEV |
|
||||
ppapi::PERMISSION_PRIVATE;
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#ifndef CHROME_COMMON_WIDEVINE_CDM_CONSTANTS_H_
|
||||
#define CHROME_COMMON_WIDEVINE_CDM_CONSTANTS_H_
|
||||
|
||||
#include "base/basictypes.h"
|
||||
#include "base/macros.h"
|
||||
#include "base/files/file_path.h"
|
||||
|
||||
// The Widevine CDM adapter and Widevine CDM are in this directory.
|
||||
|
@ -14,6 +14,6 @@ extern const base::FilePath::CharType kWidevineCdmBaseDirectory[];
|
|||
extern const char kWidevineCdmPluginExtension[];
|
||||
|
||||
// Permission bits for Widevine CDM plugin.
|
||||
extern const int32 kWidevineCdmPluginPermissions;
|
||||
extern const int32_t kWidevineCdmPluginPermissions;
|
||||
|
||||
#endif // CHROME_COMMON_WIDEVINE_CDM_CONSTANTS_H_
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue