From: Mu-Woong Lee Date: Fri, 14 Apr 2017 09:47:08 +0000 (+0900) Subject: Fix build error caused by not including new X-Git-Tag: submit/tizen/20170414.093412^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aca522db62a258adf8494f59f821c673519c110c;p=platform%2Fcore%2Fapi%2Fmotion.git Fix build error caused by not including new Change-Id: I08bea84ff53066b7d1bd017eddfbf2f604ff7677 Signed-off-by: Mu-Woong Lee --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 560fe64..304884b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,9 @@ INCLUDE_DIRECTORIES( ) ADD_DEFINITIONS(-O2 -Wall -fPIC -flto -fdata-sections -ffunction-sections -fvisibility=hidden) +ADD_DEFINITIONS(-fdiagnostics-color) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIC -Wl,--as-needed -Wl,--gc-sections -Wl,--print-gc-sections") +SET(CMAKE_VERBOSE_MAKEFILE OFF) # Build pkg_check_modules(pkgs REQUIRED ${dependency}) diff --git a/include/activity_recognition.h b/include/activity_recognition.h index a6bfc33..8d3f5cd 100644 --- a/include/activity_recognition.h +++ b/include/activity_recognition.h @@ -25,8 +25,7 @@ * @{ */ -#include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/gesture_recognition.h b/include/gesture_recognition.h index ae3bc02..024adfe 100644 --- a/include/gesture_recognition.h +++ b/include/gesture_recognition.h @@ -25,8 +25,7 @@ * @{ */ -#include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/Activity.cpp b/src/Activity.cpp index a7cf667..bf30e97 100644 --- a/src/Activity.cpp +++ b/src/Activity.cpp @@ -30,7 +30,7 @@ struct _activity_handle_s { ActivitySensor *sensor; }; -EXTAPI int activity_is_supported(activity_type_e activity, bool* supported) +EXPORT_API int activity_is_supported(activity_type_e activity, bool* supported) { if (supported) *supported = false; @@ -43,7 +43,7 @@ EXTAPI int activity_is_supported(activity_type_e activity, bool* supported) return ERR_NONE; } -EXTAPI int activity_create(activity_h *handle) +EXPORT_API int activity_create(activity_h *handle) { ASSERT_SUPPORTED(FEATURE_ACTIVITY); ASSERT_NOT_NULL(handle); @@ -62,7 +62,7 @@ EXTAPI int activity_create(activity_h *handle) return ERR_NONE; } -EXTAPI int activity_release(activity_h handle) +EXPORT_API int activity_release(activity_h handle) { ASSERT_SUPPORTED(FEATURE_ACTIVITY); ASSERT_NOT_NULL(handle); @@ -73,7 +73,7 @@ EXTAPI int activity_release(activity_h handle) return ERR_NONE; } -EXTAPI int activity_start_recognition(activity_h handle, activity_type_e activity, activity_recognition_cb callback, void *user_data) +EXPORT_API int activity_start_recognition(activity_h handle, activity_type_e activity, activity_recognition_cb callback, void *user_data) { ASSERT_SUPPORTED(FEATURE_ACTIVITY); ASSERT_NOT_NULL(handle); @@ -94,7 +94,7 @@ EXTAPI int activity_start_recognition(activity_h handle, activity_type_e activit return ERR_NONE; } -EXTAPI int activity_stop_recognition(activity_h handle) +EXPORT_API int activity_stop_recognition(activity_h handle) { ASSERT_SUPPORTED(FEATURE_ACTIVITY); ASSERT_NOT_NULL(handle); @@ -104,7 +104,7 @@ EXTAPI int activity_stop_recognition(activity_h handle) return ERR_NONE; } -EXTAPI int activity_get_accuracy(const activity_data_h data, activity_accuracy_e *accuracy) +EXPORT_API int activity_get_accuracy(const activity_data_h data, activity_accuracy_e *accuracy) { ASSERT_SUPPORTED(FEATURE_ACTIVITY); ASSERT_NOT_NULL(data); diff --git a/src/Gesture.cpp b/src/Gesture.cpp index bdb4306..2d91c70 100644 --- a/src/Gesture.cpp +++ b/src/Gesture.cpp @@ -30,7 +30,7 @@ struct _gesture_handle_s { GestureSensor *sensor; }; -EXTAPI int gesture_is_supported(gesture_type_e gesture, bool* supported) +EXPORT_API int gesture_is_supported(gesture_type_e gesture, bool* supported) { if (supported) *supported = false; @@ -43,7 +43,7 @@ EXTAPI int gesture_is_supported(gesture_type_e gesture, bool* supported) return ERR_NONE; } -EXTAPI int gesture_create(gesture_h *handle) +EXPORT_API int gesture_create(gesture_h *handle) { ASSERT_SUPPORTED(FEATURE_GESTURE); ASSERT_NOT_NULL(handle); @@ -62,7 +62,7 @@ EXTAPI int gesture_create(gesture_h *handle) return ERR_NONE; } -EXTAPI int gesture_release(gesture_h handle) +EXPORT_API int gesture_release(gesture_h handle) { ASSERT_SUPPORTED(FEATURE_GESTURE); ASSERT_NOT_NULL(handle); @@ -73,7 +73,7 @@ EXTAPI int gesture_release(gesture_h handle) return ERR_NONE; } -EXTAPI int gesture_start_recognition(gesture_h handle, gesture_type_e gesture, gesture_option_e option, gesture_recognition_cb callback, void *user_data) +EXPORT_API int gesture_start_recognition(gesture_h handle, gesture_type_e gesture, gesture_option_e option, gesture_recognition_cb callback, void *user_data) { ASSERT_SUPPORTED(FEATURE_GESTURE); ASSERT_NOT_NULL(handle); @@ -102,7 +102,7 @@ EXTAPI int gesture_start_recognition(gesture_h handle, gesture_type_e gesture, g return ERR_NONE; } -EXTAPI int gesture_stop_recognition(gesture_h handle) +EXPORT_API int gesture_stop_recognition(gesture_h handle) { ASSERT_SUPPORTED(FEATURE_GESTURE); ASSERT_NOT_NULL(handle); @@ -112,7 +112,7 @@ EXTAPI int gesture_stop_recognition(gesture_h handle) return ERR_NONE; } -EXTAPI int gesture_get_event(const gesture_data_h data, gesture_event_e *event) +EXPORT_API int gesture_get_event(const gesture_data_h data, gesture_event_e *event) { ASSERT_SUPPORTED(FEATURE_GESTURE); ASSERT_NOT_NULL(data); @@ -126,7 +126,7 @@ EXTAPI int gesture_get_event(const gesture_data_h data, gesture_event_e *event) return ERR_NONE; } -EXTAPI int gesture_get_tilt(const gesture_data_h data, int *x, int *y) +EXPORT_API int gesture_get_tilt(const gesture_data_h data, int *x, int *y) { ASSERT_SUPPORTED(FEATURE_GESTURE); ASSERT_NOT_NULL(data); diff --git a/src/TypesInternal.h b/src/TypesInternal.h index bde7980..7f5dac1 100644 --- a/src/TypesInternal.h +++ b/src/TypesInternal.h @@ -18,10 +18,9 @@ #ifndef _MOTION_TYPES_INTERNAL_H_ #define _MOTION_TYPES_INTERNAL_H_ -#include +#include #include - -#define EXTAPI __attribute__ ((visibility("default"))) +#include #define UNDEFINED -1