From 7b873addd0f520415570478208be9ad98c28ac39 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 10 Feb 2014 17:20:38 +0000 Subject: [PATCH] Fix include of C API headers from C++ code (issue #1194). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1607 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- include/capi/cef_app_capi.h | 8 ++++---- include/capi/cef_auth_callback_capi.h | 4 ++-- include/capi/cef_base_capi.h | 10 +++++----- include/capi/cef_browser_capi.h | 8 ++++---- include/capi/cef_browser_process_handler_capi.h | 8 ++++---- include/capi/cef_callback_capi.h | 4 ++-- include/capi/cef_client_capi.h | 8 ++++---- include/capi/cef_command_line_capi.h | 4 ++-- include/capi/cef_context_menu_handler_capi.h | 8 ++++---- include/capi/cef_cookie_capi.h | 6 +++--- include/capi/cef_dialog_handler_capi.h | 6 +++--- include/capi/cef_display_handler_capi.h | 8 ++++---- include/capi/cef_dom_capi.h | 4 ++-- include/capi/cef_download_handler_capi.h | 8 ++++---- include/capi/cef_download_item_capi.h | 4 ++-- include/capi/cef_drag_data_capi.h | 4 ++-- include/capi/cef_drag_handler_capi.h | 8 ++++---- include/capi/cef_focus_handler_capi.h | 8 ++++---- include/capi/cef_frame_capi.h | 8 ++++---- include/capi/cef_geolocation_capi.h | 4 ++-- include/capi/cef_geolocation_handler_capi.h | 6 +++--- include/capi/cef_jsdialog_handler_capi.h | 6 +++--- include/capi/cef_keyboard_handler_capi.h | 6 +++--- include/capi/cef_life_span_handler_capi.h | 6 +++--- include/capi/cef_load_handler_capi.h | 8 ++++---- include/capi/cef_menu_model_capi.h | 4 ++-- include/capi/cef_origin_whitelist_capi.h | 4 ++-- include/capi/cef_path_util_capi.h | 4 ++-- include/capi/cef_process_message_capi.h | 6 +++--- include/capi/cef_process_util_capi.h | 4 ++-- include/capi/cef_render_handler_capi.h | 6 +++--- include/capi/cef_render_process_handler_capi.h | 8 ++++---- include/capi/cef_request_capi.h | 4 ++-- include/capi/cef_request_context_capi.h | 4 ++-- include/capi/cef_request_context_handler_capi.h | 6 +++--- include/capi/cef_request_handler_capi.h | 8 ++++---- include/capi/cef_resource_bundle_handler_capi.h | 4 ++-- include/capi/cef_resource_handler_capi.h | 8 ++++---- include/capi/cef_response_capi.h | 4 ++-- include/capi/cef_scheme_capi.h | 8 ++++---- include/capi/cef_stream_capi.h | 4 ++-- include/capi/cef_string_visitor_capi.h | 4 ++-- include/capi/cef_task_capi.h | 4 ++-- include/capi/cef_trace_capi.h | 6 +++--- include/capi/cef_url_capi.h | 4 ++-- include/capi/cef_urlrequest_capi.h | 8 ++++---- include/capi/cef_v8_capi.h | 8 ++++---- include/capi/cef_values_capi.h | 4 ++-- include/capi/cef_web_plugin_capi.h | 6 +++--- include/capi/cef_xml_reader_capi.h | 6 +++--- include/capi/cef_zip_reader_capi.h | 6 +++--- tools/make_capi_header.py | 12 +++++++----- 52 files changed, 159 insertions(+), 157 deletions(-) diff --git a/include/capi/cef_app_capi.h b/include/capi/cef_app_capi.h index 8fdb16a57..06e0da245 100644 --- a/include/capi/cef_app_capi.h +++ b/include/capi/cef_app_capi.h @@ -38,10 +38,6 @@ #define CEF_INCLUDE_CAPI_CEF_APP_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_base_capi.h" #include "include/capi/cef_browser_process_handler_capi.h" #include "include/capi/cef_command_line_capi.h" @@ -49,6 +45,10 @@ extern "C" { #include "include/capi/cef_resource_bundle_handler_capi.h" #include "include/capi/cef_scheme_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + struct _cef_app_t; /// diff --git a/include/capi/cef_auth_callback_capi.h b/include/capi/cef_auth_callback_capi.h index d08c1e55e..e62131ab3 100644 --- a/include/capi/cef_auth_callback_capi.h +++ b/include/capi/cef_auth_callback_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_AUTH_CALLBACK_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Callback structure used for asynchronous continuation of authentication diff --git a/include/capi/cef_base_capi.h b/include/capi/cef_base_capi.h index 0323520c5..769239c7b 100644 --- a/include/capi/cef_base_capi.h +++ b/include/capi/cef_base_capi.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 Marshall A. Greenblatt. All rights reserved. +// Copyright (c) 2014 Marshall A. Greenblatt. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -31,10 +31,6 @@ #ifndef CEF_INCLUDE_CAPI_CEF_BASE_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_BASE_CAPI_H_ -#ifdef __cplusplus -extern "C" { -#endif - #include "include/internal/cef_export.h" #include "include/internal/cef_string.h" #include "include/internal/cef_string_list.h" @@ -42,6 +38,10 @@ extern "C" { #include "include/internal/cef_string_multimap.h" #include "include/internal/cef_types.h" +#ifdef __cplusplus +extern "C" { +#endif + /// // Structure defining the reference count implementation functions. All // framework structures must include the cef_base_t structure first. diff --git a/include/capi/cef_browser_capi.h b/include/capi/cef_browser_capi.h index d0399035a..288c83733 100644 --- a/include/capi/cef_browser_capi.h +++ b/include/capi/cef_browser_capi.h @@ -38,15 +38,15 @@ #define CEF_INCLUDE_CAPI_CEF_BROWSER_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_base_capi.h" #include "include/capi/cef_frame_capi.h" #include "include/capi/cef_process_message_capi.h" #include "include/capi/cef_request_context_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + struct _cef_browser_host_t; struct _cef_client_t; diff --git a/include/capi/cef_browser_process_handler_capi.h b/include/capi/cef_browser_process_handler_capi.h index c9f683dd8..1ed1deb2f 100644 --- a/include/capi/cef_browser_process_handler_capi.h +++ b/include/capi/cef_browser_process_handler_capi.h @@ -38,14 +38,14 @@ #define CEF_INCLUDE_CAPI_CEF_BROWSER_PROCESS_HANDLER_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_base_capi.h" #include "include/capi/cef_command_line_capi.h" #include "include/capi/cef_values_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + /// // Structure used to implement browser process callbacks. The functions of this diff --git a/include/capi/cef_callback_capi.h b/include/capi/cef_callback_capi.h index d071099fd..232f82262 100644 --- a/include/capi/cef_callback_capi.h +++ b/include/capi/cef_callback_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_CALLBACK_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Generic callback structure used for asynchronous continuation. diff --git a/include/capi/cef_client_capi.h b/include/capi/cef_client_capi.h index e7e2e739f..b51484971 100644 --- a/include/capi/cef_client_capi.h +++ b/include/capi/cef_client_capi.h @@ -38,10 +38,6 @@ #define CEF_INCLUDE_CAPI_CEF_CLIENT_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_base_capi.h" #include "include/capi/cef_context_menu_handler_capi.h" #include "include/capi/cef_dialog_handler_capi.h" @@ -58,6 +54,10 @@ extern "C" { #include "include/capi/cef_render_handler_capi.h" #include "include/capi/cef_request_handler_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + /// // Implement this structure to provide handler implementations. diff --git a/include/capi/cef_command_line_capi.h b/include/capi/cef_command_line_capi.h index 7e3177131..83e28cd3c 100644 --- a/include/capi/cef_command_line_capi.h +++ b/include/capi/cef_command_line_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_COMMAND_LINE_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Structure used to create and/or parse command line arguments. Arguments with diff --git a/include/capi/cef_context_menu_handler_capi.h b/include/capi/cef_context_menu_handler_capi.h index 1bb16edfa..e85d75468 100644 --- a/include/capi/cef_context_menu_handler_capi.h +++ b/include/capi/cef_context_menu_handler_capi.h @@ -38,15 +38,15 @@ #define CEF_INCLUDE_CAPI_CEF_CONTEXT_MENU_HANDLER_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_base_capi.h" #include "include/capi/cef_browser_capi.h" #include "include/capi/cef_frame_capi.h" #include "include/capi/cef_menu_model_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + struct _cef_context_menu_params_t; /// diff --git a/include/capi/cef_cookie_capi.h b/include/capi/cef_cookie_capi.h index 39caac0ff..eeca1837f 100644 --- a/include/capi/cef_cookie_capi.h +++ b/include/capi/cef_cookie_capi.h @@ -38,13 +38,13 @@ #define CEF_INCLUDE_CAPI_CEF_COOKIE_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" +#include "include/capi/cef_callback_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" -#include "include/capi/cef_callback_capi.h" - struct _cef_cookie_visitor_t; /// diff --git a/include/capi/cef_dialog_handler_capi.h b/include/capi/cef_dialog_handler_capi.h index dd3215cf3..a8165bd65 100644 --- a/include/capi/cef_dialog_handler_capi.h +++ b/include/capi/cef_dialog_handler_capi.h @@ -38,13 +38,13 @@ #define CEF_INCLUDE_CAPI_CEF_DIALOG_HANDLER_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" +#include "include/capi/cef_browser_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" -#include "include/capi/cef_browser_capi.h" - /// // Callback structure for asynchronous continuation of file dialog requests. diff --git a/include/capi/cef_display_handler_capi.h b/include/capi/cef_display_handler_capi.h index 9993d65a4..847f646e3 100644 --- a/include/capi/cef_display_handler_capi.h +++ b/include/capi/cef_display_handler_capi.h @@ -38,14 +38,14 @@ #define CEF_INCLUDE_CAPI_CEF_DISPLAY_HANDLER_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_base_capi.h" #include "include/capi/cef_browser_capi.h" #include "include/capi/cef_frame_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + /// // Implement this structure to handle events related to browser display state. diff --git a/include/capi/cef_dom_capi.h b/include/capi/cef_dom_capi.h index 9f00a8646..5a8361033 100644 --- a/include/capi/cef_dom_capi.h +++ b/include/capi/cef_dom_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_DOM_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - struct _cef_domdocument_t; struct _cef_domevent_listener_t; struct _cef_domnode_t; diff --git a/include/capi/cef_download_handler_capi.h b/include/capi/cef_download_handler_capi.h index 35a424285..9886b1945 100644 --- a/include/capi/cef_download_handler_capi.h +++ b/include/capi/cef_download_handler_capi.h @@ -38,14 +38,14 @@ #define CEF_INCLUDE_CAPI_CEF_DOWNLOAD_HANDLER_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_base_capi.h" #include "include/capi/cef_browser_capi.h" #include "include/capi/cef_download_item_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + /// // Callback structure used to asynchronously continue a download. diff --git a/include/capi/cef_download_item_capi.h b/include/capi/cef_download_item_capi.h index 239ee2953..ef5a1575d 100644 --- a/include/capi/cef_download_item_capi.h +++ b/include/capi/cef_download_item_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_DOWNLOAD_ITEM_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Structure used to represent a download item. diff --git a/include/capi/cef_drag_data_capi.h b/include/capi/cef_drag_data_capi.h index 6daa1a2e4..2182f67d4 100644 --- a/include/capi/cef_drag_data_capi.h +++ b/include/capi/cef_drag_data_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_DRAG_DATA_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Structure used to represent drag data. The functions of this structure may be diff --git a/include/capi/cef_drag_handler_capi.h b/include/capi/cef_drag_handler_capi.h index d3ef55a06..a148270da 100644 --- a/include/capi/cef_drag_handler_capi.h +++ b/include/capi/cef_drag_handler_capi.h @@ -38,14 +38,14 @@ #define CEF_INCLUDE_CAPI_CEF_DRAG_HANDLER_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_base_capi.h" #include "include/capi/cef_browser_capi.h" #include "include/capi/cef_drag_data_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + /// // Implement this structure to handle events related to dragging. The functions diff --git a/include/capi/cef_focus_handler_capi.h b/include/capi/cef_focus_handler_capi.h index 16f3aa790..61938779e 100644 --- a/include/capi/cef_focus_handler_capi.h +++ b/include/capi/cef_focus_handler_capi.h @@ -38,15 +38,15 @@ #define CEF_INCLUDE_CAPI_CEF_FOCUS_HANDLER_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_base_capi.h" #include "include/capi/cef_browser_capi.h" #include "include/capi/cef_dom_capi.h" #include "include/capi/cef_frame_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + /// // Implement this structure to handle events related to focus. The functions of diff --git a/include/capi/cef_frame_capi.h b/include/capi/cef_frame_capi.h index 2d4c61cac..25c18102d 100644 --- a/include/capi/cef_frame_capi.h +++ b/include/capi/cef_frame_capi.h @@ -38,16 +38,16 @@ #define CEF_INCLUDE_CAPI_CEF_FRAME_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_base_capi.h" #include "include/capi/cef_dom_capi.h" #include "include/capi/cef_request_capi.h" #include "include/capi/cef_stream_capi.h" #include "include/capi/cef_string_visitor_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + struct _cef_browser_t; struct _cef_v8context_t; diff --git a/include/capi/cef_geolocation_capi.h b/include/capi/cef_geolocation_capi.h index 15f852054..926cc3c9b 100644 --- a/include/capi/cef_geolocation_capi.h +++ b/include/capi/cef_geolocation_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_GEOLOCATION_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Implement this structure to receive geolocation updates. The functions of diff --git a/include/capi/cef_geolocation_handler_capi.h b/include/capi/cef_geolocation_handler_capi.h index fab6055ed..2c257fc08 100644 --- a/include/capi/cef_geolocation_handler_capi.h +++ b/include/capi/cef_geolocation_handler_capi.h @@ -38,13 +38,13 @@ #define CEF_INCLUDE_CAPI_CEF_GEOLOCATION_HANDLER_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" +#include "include/capi/cef_browser_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" -#include "include/capi/cef_browser_capi.h" - /// // Callback structure used for asynchronous continuation of geolocation diff --git a/include/capi/cef_jsdialog_handler_capi.h b/include/capi/cef_jsdialog_handler_capi.h index 92473c679..c141a0ef3 100644 --- a/include/capi/cef_jsdialog_handler_capi.h +++ b/include/capi/cef_jsdialog_handler_capi.h @@ -38,13 +38,13 @@ #define CEF_INCLUDE_CAPI_CEF_JSDIALOG_HANDLER_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" +#include "include/capi/cef_browser_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" -#include "include/capi/cef_browser_capi.h" - /// // Callback structure used for asynchronous continuation of JavaScript dialog diff --git a/include/capi/cef_keyboard_handler_capi.h b/include/capi/cef_keyboard_handler_capi.h index c10603737..d56b57bef 100644 --- a/include/capi/cef_keyboard_handler_capi.h +++ b/include/capi/cef_keyboard_handler_capi.h @@ -38,13 +38,13 @@ #define CEF_INCLUDE_CAPI_CEF_KEYBOARD_HANDLER_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" +#include "include/capi/cef_browser_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" -#include "include/capi/cef_browser_capi.h" - /// // Implement this structure to handle events related to keyboard input. The diff --git a/include/capi/cef_life_span_handler_capi.h b/include/capi/cef_life_span_handler_capi.h index d75bcabdd..3b660fa35 100644 --- a/include/capi/cef_life_span_handler_capi.h +++ b/include/capi/cef_life_span_handler_capi.h @@ -38,13 +38,13 @@ #define CEF_INCLUDE_CAPI_CEF_LIFE_SPAN_HANDLER_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" +#include "include/capi/cef_browser_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" -#include "include/capi/cef_browser_capi.h" - struct _cef_client_t; /// diff --git a/include/capi/cef_load_handler_capi.h b/include/capi/cef_load_handler_capi.h index 679bc0d6a..2ce5d092b 100644 --- a/include/capi/cef_load_handler_capi.h +++ b/include/capi/cef_load_handler_capi.h @@ -38,14 +38,14 @@ #define CEF_INCLUDE_CAPI_CEF_LOAD_HANDLER_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_base_capi.h" #include "include/capi/cef_browser_capi.h" #include "include/capi/cef_frame_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + /// // Implement this structure to handle events related to browser load status. The diff --git a/include/capi/cef_menu_model_capi.h b/include/capi/cef_menu_model_capi.h index bd253a40f..00f809677 100644 --- a/include/capi/cef_menu_model_capi.h +++ b/include/capi/cef_menu_model_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_MENU_MODEL_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Supports creation and modification of menus. See cef_menu_id_t for the diff --git a/include/capi/cef_origin_whitelist_capi.h b/include/capi/cef_origin_whitelist_capi.h index 3b56a5c86..00ed36133 100644 --- a/include/capi/cef_origin_whitelist_capi.h +++ b/include/capi/cef_origin_whitelist_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_ORIGIN_WHITELIST_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Add an entry to the cross-origin access whitelist. diff --git a/include/capi/cef_path_util_capi.h b/include/capi/cef_path_util_capi.h index ff0486036..a81f897f8 100644 --- a/include/capi/cef_path_util_capi.h +++ b/include/capi/cef_path_util_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_PATH_UTIL_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Retrieve the path associated with the specified |key|. Returns true (1) on diff --git a/include/capi/cef_process_message_capi.h b/include/capi/cef_process_message_capi.h index ba167d119..fd35b6b6b 100644 --- a/include/capi/cef_process_message_capi.h +++ b/include/capi/cef_process_message_capi.h @@ -38,13 +38,13 @@ #define CEF_INCLUDE_CAPI_CEF_PROCESS_MESSAGE_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" +#include "include/capi/cef_values_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" -#include "include/capi/cef_values_capi.h" - /// // Structure representing a message. Can be used on any process and thread. diff --git a/include/capi/cef_process_util_capi.h b/include/capi/cef_process_util_capi.h index 1c3ca06af..2d90d30ac 100644 --- a/include/capi/cef_process_util_capi.h +++ b/include/capi/cef_process_util_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_PROCESS_UTIL_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Launches the process specified via |command_line|. Returns true (1) upon diff --git a/include/capi/cef_render_handler_capi.h b/include/capi/cef_render_handler_capi.h index 63794ba3c..03ee32ab0 100644 --- a/include/capi/cef_render_handler_capi.h +++ b/include/capi/cef_render_handler_capi.h @@ -38,13 +38,13 @@ #define CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" +#include "include/capi/cef_browser_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" -#include "include/capi/cef_browser_capi.h" - /// // Implement this structure to handle events when window rendering is disabled. diff --git a/include/capi/cef_render_process_handler_capi.h b/include/capi/cef_render_process_handler_capi.h index a56eb5309..6593108e2 100644 --- a/include/capi/cef_render_process_handler_capi.h +++ b/include/capi/cef_render_process_handler_capi.h @@ -38,10 +38,6 @@ #define CEF_INCLUDE_CAPI_CEF_RENDER_PROCESS_HANDLER_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_base_capi.h" #include "include/capi/cef_browser_capi.h" #include "include/capi/cef_dom_capi.h" @@ -51,6 +47,10 @@ extern "C" { #include "include/capi/cef_v8_capi.h" #include "include/capi/cef_values_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + /// // Structure used to implement render process callbacks. The functions of this diff --git a/include/capi/cef_request_capi.h b/include/capi/cef_request_capi.h index 4e4748b36..3af22a8c7 100644 --- a/include/capi/cef_request_capi.h +++ b/include/capi/cef_request_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_REQUEST_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - struct _cef_post_data_element_t; struct _cef_post_data_t; diff --git a/include/capi/cef_request_context_capi.h b/include/capi/cef_request_context_capi.h index 7d096538b..e6c40d040 100644 --- a/include/capi/cef_request_context_capi.h +++ b/include/capi/cef_request_context_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_CAPI_H_ #pragma once +#include "include/capi/cef_request_context_handler_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_request_context_handler_capi.h" - /// // A request context provides request handling for a set of related browser diff --git a/include/capi/cef_request_context_handler_capi.h b/include/capi/cef_request_context_handler_capi.h index cfddf79a8..326701ae7 100644 --- a/include/capi/cef_request_context_handler_capi.h +++ b/include/capi/cef_request_context_handler_capi.h @@ -38,13 +38,13 @@ #define CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_HANDLER_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" +#include "include/capi/cef_cookie_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" -#include "include/capi/cef_cookie_capi.h" - /// // Implement this structure to provide handler implementations. diff --git a/include/capi/cef_request_handler_capi.h b/include/capi/cef_request_handler_capi.h index 715e253f7..bdd5da0c7 100644 --- a/include/capi/cef_request_handler_capi.h +++ b/include/capi/cef_request_handler_capi.h @@ -38,10 +38,6 @@ #define CEF_INCLUDE_CAPI_CEF_REQUEST_HANDLER_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_auth_callback_capi.h" #include "include/capi/cef_base_capi.h" #include "include/capi/cef_browser_capi.h" @@ -51,6 +47,10 @@ extern "C" { #include "include/capi/cef_response_capi.h" #include "include/capi/cef_web_plugin_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + /// // Callback structure used for asynchronous continuation of quota requests. diff --git a/include/capi/cef_resource_bundle_handler_capi.h b/include/capi/cef_resource_bundle_handler_capi.h index 1a7263233..e0ea76bc6 100644 --- a/include/capi/cef_resource_bundle_handler_capi.h +++ b/include/capi/cef_resource_bundle_handler_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_RESOURCE_BUNDLE_HANDLER_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Structure used to implement a custom resource bundle structure. The functions diff --git a/include/capi/cef_resource_handler_capi.h b/include/capi/cef_resource_handler_capi.h index d845f7fab..24bba9b41 100644 --- a/include/capi/cef_resource_handler_capi.h +++ b/include/capi/cef_resource_handler_capi.h @@ -38,10 +38,6 @@ #define CEF_INCLUDE_CAPI_CEF_RESOURCE_HANDLER_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_base_capi.h" #include "include/capi/cef_browser_capi.h" #include "include/capi/cef_callback_capi.h" @@ -49,6 +45,10 @@ extern "C" { #include "include/capi/cef_request_capi.h" #include "include/capi/cef_response_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + /// // Structure used to implement a custom request handler structure. The functions diff --git a/include/capi/cef_response_capi.h b/include/capi/cef_response_capi.h index c04ea01e7..30b3c945c 100644 --- a/include/capi/cef_response_capi.h +++ b/include/capi/cef_response_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_RESPONSE_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Structure used to represent a web response. The functions of this structure diff --git a/include/capi/cef_scheme_capi.h b/include/capi/cef_scheme_capi.h index 0129ae1f8..e993be243 100644 --- a/include/capi/cef_scheme_capi.h +++ b/include/capi/cef_scheme_capi.h @@ -38,10 +38,6 @@ #define CEF_INCLUDE_CAPI_CEF_SCHEME_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_base_capi.h" #include "include/capi/cef_browser_capi.h" #include "include/capi/cef_frame_capi.h" @@ -49,6 +45,10 @@ extern "C" { #include "include/capi/cef_resource_handler_capi.h" #include "include/capi/cef_response_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + struct _cef_scheme_handler_factory_t; /// diff --git a/include/capi/cef_stream_capi.h b/include/capi/cef_stream_capi.h index 84830c84e..8e393b3b2 100644 --- a/include/capi/cef_stream_capi.h +++ b/include/capi/cef_stream_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_STREAM_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Structure the client can implement to provide a custom stream reader. The diff --git a/include/capi/cef_string_visitor_capi.h b/include/capi/cef_string_visitor_capi.h index 93351b4d7..f047ffe5a 100644 --- a/include/capi/cef_string_visitor_capi.h +++ b/include/capi/cef_string_visitor_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_STRING_VISITOR_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Implement this structure to receive string values asynchronously. diff --git a/include/capi/cef_task_capi.h b/include/capi/cef_task_capi.h index ce79f3d70..8551d1452 100644 --- a/include/capi/cef_task_capi.h +++ b/include/capi/cef_task_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_TASK_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Implement this structure for asynchronous task execution. If the task is diff --git a/include/capi/cef_trace_capi.h b/include/capi/cef_trace_capi.h index 4d9f458f2..d298ad96f 100644 --- a/include/capi/cef_trace_capi.h +++ b/include/capi/cef_trace_capi.h @@ -38,13 +38,13 @@ #define CEF_INCLUDE_CAPI_CEF_TRACE_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" +#include "include/capi/cef_callback_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" -#include "include/capi/cef_callback_capi.h" - /// // Implement this structure to receive notification when tracing has completed. diff --git a/include/capi/cef_url_capi.h b/include/capi/cef_url_capi.h index 3254931af..648697b10 100644 --- a/include/capi/cef_url_capi.h +++ b/include/capi/cef_url_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_URL_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - /// // Parse the specified |url| into its component parts. Returns false (0) if the diff --git a/include/capi/cef_urlrequest_capi.h b/include/capi/cef_urlrequest_capi.h index 615784183..b396aa67d 100644 --- a/include/capi/cef_urlrequest_capi.h +++ b/include/capi/cef_urlrequest_capi.h @@ -38,15 +38,15 @@ #define CEF_INCLUDE_CAPI_CEF_URLREQUEST_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_auth_callback_capi.h" #include "include/capi/cef_base_capi.h" #include "include/capi/cef_request_capi.h" #include "include/capi/cef_response_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + struct _cef_urlrequest_client_t; /// diff --git a/include/capi/cef_v8_capi.h b/include/capi/cef_v8_capi.h index af004eeed..4953be31e 100644 --- a/include/capi/cef_v8_capi.h +++ b/include/capi/cef_v8_capi.h @@ -38,15 +38,15 @@ #define CEF_INCLUDE_CAPI_CEF_V8_CAPI_H_ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "include/capi/cef_base_capi.h" #include "include/capi/cef_browser_capi.h" #include "include/capi/cef_frame_capi.h" #include "include/capi/cef_task_capi.h" +#ifdef __cplusplus +extern "C" { +#endif + struct _cef_v8exception_t; struct _cef_v8handler_t; struct _cef_v8stack_frame_t; diff --git a/include/capi/cef_values_capi.h b/include/capi/cef_values_capi.h index d0dc310c6..0fd96fd3a 100644 --- a/include/capi/cef_values_capi.h +++ b/include/capi/cef_values_capi.h @@ -38,12 +38,12 @@ #define CEF_INCLUDE_CAPI_CEF_VALUES_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" - struct _cef_dictionary_value_t; struct _cef_list_value_t; diff --git a/include/capi/cef_web_plugin_capi.h b/include/capi/cef_web_plugin_capi.h index 953f7ca9c..a9d089b77 100644 --- a/include/capi/cef_web_plugin_capi.h +++ b/include/capi/cef_web_plugin_capi.h @@ -38,13 +38,13 @@ #define CEF_INCLUDE_CAPI_CEF_WEB_PLUGIN_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" +#include "include/capi/cef_browser_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" -#include "include/capi/cef_browser_capi.h" - /// // Information about a specific web plugin. diff --git a/include/capi/cef_xml_reader_capi.h b/include/capi/cef_xml_reader_capi.h index 8c6a814f2..1a7bd2104 100644 --- a/include/capi/cef_xml_reader_capi.h +++ b/include/capi/cef_xml_reader_capi.h @@ -38,13 +38,13 @@ #define CEF_INCLUDE_CAPI_CEF_XML_READER_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" +#include "include/capi/cef_stream_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" -#include "include/capi/cef_stream_capi.h" - /// // Structure that supports the reading of XML data via the libxml streaming API. diff --git a/include/capi/cef_zip_reader_capi.h b/include/capi/cef_zip_reader_capi.h index 02de8cd83..b9a5094e8 100644 --- a/include/capi/cef_zip_reader_capi.h +++ b/include/capi/cef_zip_reader_capi.h @@ -38,13 +38,13 @@ #define CEF_INCLUDE_CAPI_CEF_ZIP_READER_CAPI_H_ #pragma once +#include "include/capi/cef_base_capi.h" +#include "include/capi/cef_stream_capi.h" + #ifdef __cplusplus extern "C" { #endif -#include "include/capi/cef_base_capi.h" -#include "include/capi/cef_stream_capi.h" - /// // Structure that supports the reading of zip archives via the zlib unzip API. diff --git a/tools/make_capi_header.py b/tools/make_capi_header.py index ff519a568..8cf897773 100644 --- a/tools/make_capi_header.py +++ b/tools/make_capi_header.py @@ -86,10 +86,6 @@ def make_capi_header(header, filename): #define $GUARD$ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - """ classes = header.get_classes(filename) @@ -112,7 +108,13 @@ extern "C" { else: result += '#include "include/capi/cef_base_capi.h"\n' - result += '\n' + result += \ +""" +#ifdef __cplusplus +extern "C" { +#endif + +""" # output forward declarations if len(all_declares) > 0: