bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix C compile error due to unintentional C++ include (fixes issue #2728)

Browse Source
This commit is contained in:
Marshall Greenblatt
2019-07-25 12:56:42 -04:00
parent 1d3b911b16
commit d82624411e
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/capi/cef_resource_handler_capi.h
View File

@@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=f94ec1ef3928002394720160d526ed157282cc7a$ // $hash=8c6ffeab9c9183cc5f77929839643767ce5c5c2f$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_HANDLER_CAPI_H_
@@ -151,9 +151,9 @@ typedef struct _cef_resource_handler_t {
/// ///
// Skip response data when requested by a Range header. Skip over and discard // Skip response data when requested by a Range header. Skip over and discard
// |bytes_to_skip| bytes of response data. If data is available immediately // |bytes_to_skip| bytes of response data. If data is available immediately
// set |bytes_skipped| to the number of of bytes skipped and return true (1). // set |bytes_skipped| to the number of bytes skipped and return true (1). To
// To read the data at a later time set |bytes_skipped| to 0, return true (1) // read the data at a later time set |bytes_skipped| to 0, return true (1) and
// and execute |callback| when the data is available. To indicate failure set // execute |callback| when the data is available. To indicate failure set
// |bytes_skipped| to < 0 (e.g. -2 for ERR_FAILED) and return false (0). This // |bytes_skipped| to < 0 (e.g. -2 for ERR_FAILED) and return false (0). This
// function will be called in sequence but not from a dedicated thread. // function will be called in sequence but not from a dedicated thread.
/// ///

3
include/capi/cef_resource_request_handler_capi.h
View File

@@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for // by hand. See the translator.README.txt file in the tools directory for
// more information. // more information.
// //
// $hash=af8ddd4d2d19e5b64d0a40778cb3c62fd5f1d8c9$ // $hash=adb3ca1e315a28efed7b2305c8aceb9c5eafdc66$
// //
#ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_REQUEST_HANDLER_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_RESOURCE_REQUEST_HANDLER_CAPI_H_
@@ -48,7 +48,6 @@
#include "include/capi/cef_resource_handler_capi.h" #include "include/capi/cef_resource_handler_capi.h"
#include "include/capi/cef_response_capi.h" #include "include/capi/cef_response_capi.h"
#include "include/capi/cef_response_filter_capi.h" #include "include/capi/cef_response_filter_capi.h"
#include "include/internal/cef_types_wrappers.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

10
include/cef_api_hash.h
View File

@@ -34,7 +34,7 @@
// implementations. See the translator.README.txt file in the tools directory // implementations. See the translator.README.txt file in the tools directory
// for more information. // for more information.
// //
// $hash=467550bc7fb025b069edb9dc65988d8cb9c56fd2$ // $hash=23774ff0da7e40bab8244ff4b661b1d9fed24107$
// //
#ifndef CEF_INCLUDE_API_HASH_H_ #ifndef CEF_INCLUDE_API_HASH_H_
@@ -47,13 +47,13 @@
// way that may cause binary incompatibility with other builds. The universal // way that may cause binary incompatibility with other builds. The universal
// hash value will change if any platform is affected whereas the platform hash // hash value will change if any platform is affected whereas the platform hash
// values will change only if that particular platform is affected. // values will change only if that particular platform is affected.
#define CEF_API_HASH_UNIVERSAL "3f2fd465a9dc95ef7d645c0b3c8bdf4e26d9b26e" #define CEF_API_HASH_UNIVERSAL "d04fc15ff27c5a8ee71fee4a88383e5c4bbb7b10"
#if defined(OS_WIN) #if defined(OS_WIN)
#define CEF_API_HASH_PLATFORM "37fc3765fe0ef3ef7542e6568e5689b3575968a8" #define CEF_API_HASH_PLATFORM "031426ad8eb80ee32fcf3605837cff8d3bbae3a4"
#elif defined(OS_MACOSX) #elif defined(OS_MACOSX)
#define CEF_API_HASH_PLATFORM "dc61db096a4b62365b16d450fe4f898a9552da6a" #define CEF_API_HASH_PLATFORM "47422c9703f7c32013642707b976d299c72f42cb"
#elif defined(OS_LINUX) #elif defined(OS_LINUX)
#define CEF_API_HASH_PLATFORM "059d7243ae34aa5503c96a21ce24a673dddf4e64" #define CEF_API_HASH_PLATFORM "d333fdd7eee13c06f58e586513061ce121121e0b"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

1
include/cef_resource_request_handler.h
View File

@@ -46,7 +46,6 @@
#include "include/cef_resource_handler.h" #include "include/cef_resource_handler.h"
#include "include/cef_response.h" #include "include/cef_response.h"
#include "include/cef_response_filter.h" #include "include/cef_response_filter.h"
#include "include/internal/cef_types_wrappers.h"
class CefCookieAccessFilter; class CefCookieAccessFilter;