[FIX] build ecore probes for 2.4

Change-Id: I5ea387bbbdc263728ba6e12eae7879492744bcd1
Signed-off-by: Vitaliy Cherepanov <v.cherepanov@samsung.com>

diff --git a/probe_capi/capi_appfw.c b/probe_capi/capi_appfw.c
index 9c9b68a..237f3a0 100644 (file)
--- a/probe_capi/capi_appfw.c
+++ b/probe_capi/capi_appfw.c
@@ -44,7 +44,6 @@
 Ecore_Event_Handler *register_orientation_event_listener();
 void unregister_orientation_event_listener(Ecore_Event_Handler *handler);
 
-app_event_callback_s gAppCallback;
 ui_app_lifecycle_callback_s uiAppCallback;
 
 #define PACK_ORIGINAL_APPFWCYCLE(API_ID, RTYPE, RVAL, INPUTFORMAT, ...)                \
@@ -57,140 +56,6 @@ ui_app_lifecycle_callback_s uiAppCallback;
        } while(0);                                                             \
        errno = (newerrno != 0) ? newerrno : olderrno
 
-static bool _dalc_app_create(void *user_data)
-{
-       bool bret = false;
-       DECLARE_ERRNO_VARS;
-       int blockresult = 1;
-
-       bret = gAppCallback.create(user_data);
-
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_create, 'b', bret, "p",
-                                voidp_to_uint64(user_data));
-
-       return bret;
-}
-
-static void _dalc_app_terminate(void *user_data)
-{
-       DECLARE_ERRNO_VARS;
-       int blockresult = 1;
-
-       gAppCallback.terminate(user_data);
-
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_terminate, 'v', 0, "p",
-                                voidp_to_uint64(user_data));
-}
-
-static void _dalc_app_pause(void *user_data)
-{
-       DECLARE_ERRNO_VARS;
-       int blockresult = 1;
-
-       gAppCallback.pause(user_data);
-
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_pause, 'v', 0, "p",
-                                voidp_to_uint64(user_data));
-}
-
-static void _dalc_app_resume(void *user_data)
-{
-       DECLARE_ERRNO_VARS;
-       int blockresult = 1;
-
-       gAppCallback.resume(user_data);
-
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_resume, 'v', 0, "p",
-                                voidp_to_uint64(user_data));
-}
-
-#ifdef PRIVATE_CAPI_APPFW
-static void _dalc_app_control(app_control_h handle, void *user_data)
-#else /* !PRIVATE_CAPI_APPFW */
-static void _dalc_app_service(service_h handle, void *user_data)
-#endif /* PRIVATE_CAPI_APPFW */
-{
-       DECLARE_ERRNO_VARS;
-       int blockresult = 1;
-
-#ifdef PRIVATE_CAPI_APPFW
-       gAppCallback.app_control(handle, user_data);
-#else /* !PRIVATE_CAPI_APPFW */
-       gAppCallback.service(handle, user_data);
-#endif /* PRIVATE_CAPI_APPFW */
-
-       PACK_ORIGINAL_APPFWCYCLE(API_ID__dalc_app_service, 'v', 0, "dp",
-                                (unsigned int)handle,
-                                voidp_to_uint64(user_data));
-}
-
-static void _dalc_app_deviceorientationchanged(app_device_orientation_e orientation, void *user_data)
-{
-       on_orientation_changed((int)orientation, true);
-
-       if (gAppCallback.device_orientation)
-               gAppCallback.device_orientation(orientation, user_data);
-}
-
-int app_efl_main(int *argc, char ***argv, app_event_callback_s *callback, void *user_data)
-{
-       static int (*app_efl_mainp)(int *argc, char ***argv, app_event_callback_s *callback, void *user_data);
-       Ecore_Event_Handler* handler;
-       int ret;
-
-       GET_REAL_FUNCP_RTLD_NEXT(app_efl_main, app_efl_mainp);
-
-       probeBlockStart();
-       handler = register_orientation_event_listener();
-       gAppCallback.create = callback->create;
-       gAppCallback.terminate = callback->terminate;
-       gAppCallback.pause = callback->pause;
-       gAppCallback.resume = callback->resume;
-#ifdef PRIVATE_CAPI_APPFW
-       gAppCallback.app_control = callback->app_control;
-#else /* !PRIVATE_CAPI_APPFW */
-       gAppCallback.service = callback->service;
-#endif /* PRIVATE_CAPI_APPFW */
-       gAppCallback.device_orientation = callback->device_orientation;
-
-       if (callback->create)
-               callback->create = _dalc_app_create;
-       if (callback->terminate)
-               callback->terminate = _dalc_app_terminate;
-       if (callback->pause)
-               callback->pause = _dalc_app_pause;
-       if (callback->resume)
-               callback->resume = _dalc_app_resume;
-#ifdef PRIVATE_CAPI_APPFW
-       if (callback->app_control)
-               callback->app_control = _dalc_app_control;
-#else /* !PRIVATE_CAPI_APPFW */
-       if (callback->service)
-               callback->service = _dalc_app_service;
-#endif /* PRIVATE_CAPI_APPFW */
-       callback->device_orientation = _dalc_app_deviceorientationchanged;
-       probeBlockEnd();
-
-       ret = app_efl_mainp(argc, argv, callback, user_data);
-
-       probeBlockStart();
-       unregister_orientation_event_listener(handler);
-       callback->create = gAppCallback.create;
-       callback->terminate = gAppCallback.terminate;
-       callback->pause = gAppCallback.pause;
-       callback->resume = gAppCallback.resume;
-#ifdef PRIVATE_CAPI_APPFW
-       callback->app_control = gAppCallback.app_control;
-#else /* !PRIVATE_CAPI_APPFW */
-       callback->service = gAppCallback.service;
-#endif /* PRIVATE_CAPI_APPFW */
-       callback->device_orientation = gAppCallback.device_orientation;
-       probeBlockEnd();
-
-       return ret;
-}
-
-
 /************************************ UI APP ******************************************/
 static bool _ui_dalc_app_create(void *user_data)
 {