stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=cfbdcdc9c81c5cd14d8dc9f1db4d102d8052b473
commit cfbdcdc9c81c5cd14d8dc9f1db4d102d8052b473 Author: Vincent Torri <[email protected]> Date: Wed Jun 10 05:07:47 2020 +0000 Use extern after EAPI Reviewed-by: Stefan Schmidt <[email protected]> Differential Revision: https://phab.enlightenment.org/D11961 --- doc/eo_tutorial.dox | 4 ++-- src/lib/ecore/Efl_Core.h | 2 +- src/lib/eina/eina_log.h | 4 ++-- src/lib/eina/eina_module.h | 4 ++-- src/lib/elementary/Efl_Ui.h | 4 ++-- src/lib/elementary/elm_code_parse.h | 6 +++--- src/lib/elementary/elm_general.h | 2 +- src/lib/elementary/elm_widget.h | 2 +- src/lib/evas/common/evas_font_private.h | 2 +- src/lib/evas/include/evas_common_private.h | 2 +- src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/eo_tutorial.dox b/doc/eo_tutorial.dox index baeb10d857..1cf0a2ee12 100644 --- a/doc/eo_tutorial.dox +++ b/doc/eo_tutorial.dox @@ -122,7 +122,7 @@ * - If the object is new, establish the public APIs * - \#define \$(CLASS_NAME) \$(class_name)_class_get(): will be used to access data/inherit from this class... * - const Eo_Class *\$(class_name)_class_get(void) EINA_CONST: declaration of the function that will create the class (not the instance), i.e virtual table... - * - extern EAPI Eo_Op \$(CLASS_NAME)_BASE_ID: class id that will be essentially used to identify functions set of this class + * - EAPI extern Eo_Op \$(CLASS_NAME)_BASE_ID: class id that will be essentially used to identify functions set of this class * - enum of the function ids of the class in the form \$(CLASS_NAME)_SUB_ID: used to identify the function inside the class; function id is unique per class but (class id, function id) is unique per system.. * - \#define \$(CLASS_NAME)_ID(sub_id) (\$(CLASS_NAME)_BASE_ID + sub_id): formula to calculate the system function id * - define of each function consists of: @@ -138,7 +138,7 @@ const Eo_Class *evas_object_line_class_get(void) EINA_CONST; - extern EAPI Eo_Op EVAS_OBJ_LINE_BASE_ID; + EAPI extern Eo_Op EVAS_OBJ_LINE_BASE_ID; enum { diff --git a/src/lib/ecore/Efl_Core.h b/src/lib/ecore/Efl_Core.h index 0178299379..7e80819b83 100644 --- a/src/lib/ecore/Efl_Core.h +++ b/src/lib/ecore/Efl_Core.h @@ -54,7 +54,7 @@ extern "C" { #endif -extern EAPI double _efl_startup_time; +EAPI extern double _efl_startup_time; #include "Ecore_Common.h" #include "Ecore_Eo.h" diff --git a/src/lib/eina/eina_log.h b/src/lib/eina/eina_log.h index fd6f6c4252..b45a191ac2 100644 --- a/src/lib/eina/eina_log.h +++ b/src/lib/eina/eina_log.h @@ -979,9 +979,9 @@ EAPI void eina_log_console_color_set(FILE *fp, const char *color) EINA_ARG_NONNULL(1, 2); /** String that indicates the log system is initializing. */ -extern EAPI const char *_eina_log_state_init; +EAPI extern const char *_eina_log_state_init; /** String that indicates the log system is shutting down. */ -extern EAPI const char *_eina_log_state_shutdown; +EAPI extern const char *_eina_log_state_shutdown; /** * @def EINA_LOG_STATE_INIT * String that indicates the log system is initializing diff --git a/src/lib/eina/eina_module.h b/src/lib/eina/eina_module.h index 1fbd6153ac..22f4c3f190 100644 --- a/src/lib/eina/eina_module.h +++ b/src/lib/eina/eina_module.h @@ -106,8 +106,8 @@ typedef void (*Eina_Module_Shutdown)(void); */ #define EINA_MODULE_SHUTDOWN(f) EXPORTAPI Eina_Module_Shutdown __eina_module_shutdown = &f -extern EAPI Eina_Error EINA_ERROR_WRONG_MODULE; -extern EAPI Eina_Error EINA_ERROR_MODULE_INIT_FAILED; +EAPI extern Eina_Error EINA_ERROR_WRONG_MODULE; +EAPI extern Eina_Error EINA_ERROR_MODULE_INIT_FAILED; /** * @brief Returns a new module. diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h index e2d0cf6abe..3a64e9fdb0 100644 --- a/src/lib/elementary/Efl_Ui.h +++ b/src/lib/elementary/Efl_Ui.h @@ -105,10 +105,10 @@ extern "C" { #endif -extern EAPI double _efl_startup_time; +EAPI extern double _efl_startup_time; /** Successfully applied the requested style from the current theme. */ -extern EAPI Eina_Error EFL_UI_THEME_APPLY_ERROR_NONE; +EAPI extern Eina_Error EFL_UI_THEME_APPLY_ERROR_NONE; // EO types. Defined for legacy-only builds as legacy uses typedef of EO types. #include "efl_ui.eot.h" diff --git a/src/lib/elementary/elm_code_parse.h b/src/lib/elementary/elm_code_parse.h index 4b53e0f2c9..91cd5eba13 100644 --- a/src/lib/elementary/elm_code_parse.h +++ b/src/lib/elementary/elm_code_parse.h @@ -12,9 +12,9 @@ extern "C" { typedef struct _Elm_Code_Parser Elm_Code_Parser; -extern EAPI Elm_Code_Parser *ELM_CODE_PARSER_STANDARD_SYNTAX; /**< A provided parser to provide syntax highlighting */ -extern EAPI Elm_Code_Parser *ELM_CODE_PARSER_STANDARD_DIFF; /**< A provided parser that will mark up diff text */ -extern EAPI Elm_Code_Parser *ELM_CODE_PARSER_STANDARD_TODO; /**< A provided parser that will highlight TODO and FIXME lines */ +EAPI extern Elm_Code_Parser *ELM_CODE_PARSER_STANDARD_SYNTAX; /**< A provided parser to provide syntax highlighting */ +EAPI extern Elm_Code_Parser *ELM_CODE_PARSER_STANDARD_DIFF; /**< A provided parser that will mark up diff text */ +EAPI extern Elm_Code_Parser *ELM_CODE_PARSER_STANDARD_TODO; /**< A provided parser that will highlight TODO and FIXME lines */ /** * @brief Parser helper functions. diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h index ff23de9f0f..84d7e49e79 100644 --- a/src/lib/elementary/elm_general.h +++ b/src/lib/elementary/elm_general.h @@ -522,7 +522,7 @@ EAPI extern int ELM_EVENT_PROCESS_FOREGROUND; typedef Eina_Bool (*Elm_Event_Cb)(void *data, Evas_Object *obj, Evas_Object *src, Evas_Callback_Type type, void *event_info); /**< Function prototype definition for callbacks on input events happening on Elementary widgets. @a data will receive the user data pointer passed to elm_object_event_callback_add(). @a src will be a pointer to the widget on which the input event took place. @a type will get the type of this event and @a event_info, the struct with details on this event. */ -extern EAPI double _elm_startup_time; +EAPI extern double _elm_startup_time; #ifndef ELM_LIB_QUICKLAUNCH #define ELM_MAIN() int main(int argc, char **argv) { int ret__; _elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); ret__ = elm_main(argc, argv); elm_shutdown(); return ret__; } /**< macro to be used after the elm_main() function */ diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h index 8a6d5dd855..88e3ff6b39 100644 --- a/src/lib/elementary/elm_widget.h +++ b/src/lib/elementary/elm_widget.h @@ -301,7 +301,7 @@ #include "efl_ui.eot.h" typedef Eo Efl_Ui_Focus_Manager; -extern EAPI Eina_Error EFL_UI_THEME_APPLY_ERROR_NONE; +EAPI extern Eina_Error EFL_UI_THEME_APPLY_ERROR_NONE; #define _EFL_UI_FOCUS_MANAGER_EO_CLASS_TYPE #include "efl_ui_focus_object.eo.h" diff --git a/src/lib/evas/common/evas_font_private.h b/src/lib/evas/common/evas_font_private.h index 213ef7f96f..4ff9a12ab1 100644 --- a/src/lib/evas/common/evas_font_private.h +++ b/src/lib/evas/common/evas_font_private.h @@ -4,7 +4,7 @@ #include "evas_font.h" /* macros needed to log message through eina_log */ -extern EAPI int _evas_font_log_dom_global; +EAPI extern int _evas_font_log_dom_global; #ifdef _EVAS_FONT_DEFAULT_LOG_DOM # undef _EVAS_FONT_DEFAULT_LOG_DOM #endif diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h index 0190b27163..4d9368b31b 100644 --- a/src/lib/evas/include/evas_common_private.h +++ b/src/lib/evas/include/evas_common_private.h @@ -86,7 +86,7 @@ #endif /* macros needed to log message through eina_log */ -extern EAPI int _evas_log_dom_global; +EAPI extern int _evas_log_dom_global; #ifdef _EVAS_DEFAULT_LOG_DOM # undef _EVAS_DEFAULT_LOG_DOM #endif diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index 450f0aa16c..8142f0999b 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -6,8 +6,8 @@ #include <Evas_Engine_Wayland.h> #include "ecore_wl2_internal.h" -extern EAPI Eina_List *_evas_canvas_image_data_unset(Evas *eo_e); -extern EAPI void _evas_canvas_image_data_regenerate(Eina_List *list); +EAPI extern Eina_List *_evas_canvas_image_data_unset(Evas *eo_e); +EAPI extern void _evas_canvas_image_data_regenerate(Eina_List *list); #define _smart_frame_type "ecore_evas_wl_frame" --
