From 61b21aeb9748d5c92bbd9e7f6fb7487a6e7105a7 Mon Sep 17 00:00:00 2001 From: Lukasz Stanislawski Date: Tue, 15 Mar 2016 20:32:02 +0900 Subject: [PATCH] Fix SDK build In new Tizen 3.0 public rootstrap dlog header contains only definition of dlog_print functions, however no LOG(E|D|I|W) methods. This patch fixes build by redefining if needed this log functions. Change-Id: I7cf6767c5d903ab00074ed305f9c4c26d10da382 --- inc/homescreen-efl.h | 6 +----- inc/util.h | 22 ++++++++++++++++++++++ src/page_scroller.c | 2 +- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/inc/homescreen-efl.h b/inc/homescreen-efl.h index f75fe05..c2e2afd 100644 --- a/inc/homescreen-efl.h +++ b/inc/homescreen-efl.h @@ -27,15 +27,11 @@ #include "app_item.h" #include "tree.h" -#ifdef LOG_TAG -#undef LOG_TAG -#endif -#define LOG_TAG "HOMESCREEN_EFL" - #if !defined(PACKAGE) #define PACKAGE "org.tizen.homescreen-efl" #endif + typedef enum { HOMESCREEN_VIEW_HOME = 0, HOMESCREEN_VIEW_HOME_EDIT, diff --git a/inc/util.h b/inc/util.h index d253fb8..23b3f03 100644 --- a/inc/util.h +++ b/inc/util.h @@ -23,6 +23,11 @@ #define BUF_SIZE 64 +#ifdef LOG_TAG +#undef LOG_TAG +#endif +#define LOG_TAG "HOMESCREEN_EFL" + /* Multi-language */ #ifndef _ #define _(str) gettext(str) @@ -35,6 +40,23 @@ #define COUNT_OF(x) \ ((sizeof(x)/sizeof(0[x])) / ((size_t)(!(sizeof(x) % sizeof(0[x]))))) +#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) + +#if !defined(LOGD) +#define LOGD(fmt, arg...) dlog_print(DLOG_DEBUG, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg) +#endif + +#if !defined(LOGW) +#define LOGW(fmt, arg...) dlog_print(DLOG_WARN, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg) +#endif + +#if !defined(LOGE) +#define LOGE(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg) +#endif + +#if !defined(LOGI) +#define LOGI(fmt, arg...) dlog_print(DLOG_ERROR, LOG_TAG, "%s: %s[%d]\t " #fmt "\n", __FILENAME__, __func__, __LINE__, ##arg) +#endif /** * @brief Creates elm_layout widget and load edje file to it. diff --git a/src/page_scroller.c b/src/page_scroller.c index 3d6d972..5a64698 100644 --- a/src/page_scroller.c +++ b/src/page_scroller.c @@ -334,7 +334,7 @@ static Evas_Object* __page_scroller_create_scroller(void) Evas_Object *box = NULL; if (!win) { - print_log(DLOG_ERROR, LOG_TAG, "Window doesn't exist"); + LOGD("Window doesn't exist"); return NULL; } -- 2.7.4