| Index: ppapi/c/pp_file_info.h
|
| ===================================================================
|
| --- ppapi/c/pp_file_info.h (revision 89748)
|
| +++ ppapi/c/pp_file_info.h (working copy)
|
| @@ -1,9 +1,9 @@
|
| -/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| * Use of this source code is governed by a BSD-style license that can be
|
| * found in the LICENSE file.
|
| */
|
| -#ifndef PPAPI_C_DEV_PP_FILE_INFO_DEV_H_
|
| -#define PPAPI_C_DEV_PP_FILE_INFO_DEV_H_
|
| +#ifndef PPAPI_C_PP_FILE_INFO_H_
|
| +#define PPAPI_C_PP_FILE_INFO_H_
|
|
|
| #include "ppapi/c/pp_macros.h"
|
| #include "ppapi/c/pp_stdint.h"
|
| @@ -13,26 +13,25 @@
|
| PP_FILETYPE_REGULAR,
|
| PP_FILETYPE_DIRECTORY,
|
| PP_FILETYPE_OTHER /* A catch-all for unidentified types. */
|
| -} PP_FileType_Dev;
|
| -PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileType_Dev, 4);
|
| +} PP_FileType;
|
| +PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileType, 4);
|
|
|
| typedef enum {
|
| PP_FILESYSTEMTYPE_INVALID = 0, /* For identifying invalid return values. */
|
| PP_FILESYSTEMTYPE_EXTERNAL,
|
| PP_FILESYSTEMTYPE_LOCALPERSISTENT,
|
| PP_FILESYSTEMTYPE_LOCALTEMPORARY
|
| -} PP_FileSystemType_Dev;
|
| -PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileSystemType_Dev, 4);
|
| +} PP_FileSystemType;
|
| +PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileSystemType, 4);
|
|
|
| -struct PP_FileInfo_Dev {
|
| +struct PP_FileInfo {
|
| int64_t size; /* Measured in bytes */
|
| - PP_FileType_Dev type;
|
| - PP_FileSystemType_Dev system_type;
|
| + PP_FileType type;
|
| + PP_FileSystemType system_type;
|
| PP_Time creation_time;
|
| PP_Time last_access_time;
|
| PP_Time last_modified_time;
|
| };
|
| -PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_FileInfo_Dev, 40);
|
| +PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_FileInfo, 40);
|
|
|
| -#endif /* PPAPI_C_DEV_PP_FILE_INFO_DEV_H_ */
|
| -
|
| +#endif /* PPAPI_C_PP_FILE_INFO_H_ */
|
|
|