Revert "Fix invalid assignment with pointer"

build failure occured to 64bit build.

This reverts commit 1cb81e57d06d6e82112c42764070deb81e134915.

Change-Id: I06bd7dc891f375d8fa6ffa177d1e02ff41861db6
Signed-off-by: Junkyeong Kim <jk0430.kim@samsung.com>

diff --git a/src/tdm_capture.c b/src/tdm_capture.c
index d50e9c1..5054136 100644 (file)
--- a/src/tdm_capture.c
+++ b/src/tdm_capture.c
@@ -130,7 +130,7 @@ _tdm_capture_thread_cb_done(tdm_private_display *private_display, void *object,
 
        if (tdm_ttrace_module & TDM_TTRACE_CAPTURE) {
                tbm_bo bo = tbm_surface_internal_get_bo(buffer, 0);
-               TDM_TRACE_ASYNC_END((int)private_capture, "[CAPTURE] %d", tbm_bo_export(bo));
+               TDM_TRACE_ASYNC_END((intptr_t)private_capture, "[CAPTURE] %d", tbm_bo_export(bo));
        }
 
        if (!LIST_IS_EMPTY(&private_capture->buffer_list)) {
@@ -447,7 +447,7 @@ tdm_capture_destroy_internal(tdm_private_capture *private_capture)
 
                        if (tdm_ttrace_module & TDM_TTRACE_CAPTURE) {
                                tbm_bo bo = tbm_surface_internal_get_bo(b->buffer, 0);
-                               TDM_TRACE_ASYNC_END((int)private_capture, "[CAPTURE] %d", tbm_bo_export(bo));
+                               TDM_TRACE_ASYNC_END((intptr_t)private_capture, "[CAPTURE] %d", tbm_bo_export(bo));
                        }
 
                        tdm_buffer_unref_backend(b->buffer);
@@ -472,7 +472,7 @@ tdm_capture_destroy_internal(tdm_private_capture *private_capture)
 
                        if (tdm_ttrace_module & TDM_TTRACE_CAPTURE) {
                                tbm_bo bo = tbm_surface_internal_get_bo(b->buffer, 0);
-                               TDM_TRACE_ASYNC_END((int)private_capture, "[CAPTURE] %d", tbm_bo_export(bo));
+                               TDM_TRACE_ASYNC_END((intptr_t)private_capture, "[CAPTURE] %d", tbm_bo_export(bo));
                        }
 
                        tdm_buffer_unref_backend(b->buffer);
@@ -643,7 +643,7 @@ tdm_capture_attach(tdm_capture *capture, tbm_surface_h buffer)
 
        if (tdm_ttrace_module & TDM_TTRACE_CAPTURE) {
                tbm_bo bo = tbm_surface_internal_get_bo(buffer, 0);
-               TDM_TRACE_ASYNC_BEGIN((int)capture, "[CAPTURE] %d", tbm_bo_export(bo));
+               TDM_TRACE_ASYNC_BEGIN((intptr_t)capture, "[CAPTURE] %d", tbm_bo_export(bo));
        }
 
        _pthread_mutex_unlock(&private_display->lock);

diff --git a/src/tdm_layer.c b/src/tdm_layer.c
index d7c20e6..b6f07f0 100644 (file)
--- a/src/tdm_layer.c
+++ b/src/tdm_layer.c
@@ -536,7 +536,7 @@ tdm_layer_set_buffer_internal(tdm_private_layer *private_layer, tbm_surface_h bu
 
                if (tdm_ttrace_module & TDM_TTRACE_LAYER) {
                        tbm_bo bo = tbm_surface_internal_get_bo(private_layer->pending_buffer, 0);
-                       TDM_TRACE_ASYNC_END((int)private_layer, "[LAYER] %d", tbm_bo_export(bo));
+                       TDM_TRACE_ASYNC_END((intptr_t)private_layer, "[LAYER] %d", tbm_bo_export(bo));
                }
 
                tbm_surface_internal_unref(private_layer->pending_buffer);
@@ -554,7 +554,7 @@ tdm_layer_set_buffer_internal(tdm_private_layer *private_layer, tbm_surface_h bu
 
        if (tdm_ttrace_module & TDM_TTRACE_LAYER) {
                tbm_bo bo = tbm_surface_internal_get_bo(private_layer->pending_buffer, 0);
-               TDM_TRACE_ASYNC_BEGIN((int)private_layer, "[LAYER] %d", tbm_bo_export(bo));
+               TDM_TRACE_ASYNC_BEGIN((intptr_t)private_layer, "[LAYER] %d", tbm_bo_export(bo));
        }
 
        return TDM_ERROR_NONE;
@@ -648,7 +648,7 @@ tdm_layer_committed(tdm_private_layer *private_layer, tdm_private_layer_buffer *
        if (private_layer->showing_buffer) {
                if (tdm_ttrace_module & TDM_TTRACE_LAYER) {
                        tbm_bo bo = tbm_surface_internal_get_bo(private_layer->showing_buffer->buffer, 0);
-                       TDM_TRACE_ASYNC_END((int)private_layer, "[LAYER] %d", tbm_bo_export(bo));
+                       TDM_TRACE_ASYNC_END((intptr_t)private_layer, "[LAYER] %d", tbm_bo_export(bo));
                }
 
                tdm_layer_free_buffer(private_layer, private_layer->showing_buffer);

diff --git a/src/tdm_pp.c b/src/tdm_pp.c
index f0d249d..ea3f5f0 100644 (file)
--- a/src/tdm_pp.c
+++ b/src/tdm_pp.c
@@ -147,7 +147,7 @@ _tdm_pp_thread_cb_done(tdm_private_display *private_display, void *object, tdm_t
 
                if (tdm_ttrace_module & TDM_TTRACE_PP) {
                        tbm_bo bo = tbm_surface_internal_get_bo(dst, 0);
-                       TDM_TRACE_ASYNC_END((int)private_pp, "[PP] %d", tbm_bo_export(bo));
+                       TDM_TRACE_ASYNC_END((intptr_t)private_pp, "[PP] %d", tbm_bo_export(bo));
                }
 
                _pthread_mutex_unlock(&private_display->lock);
@@ -376,7 +376,7 @@ tdm_pp_destroy_internal(tdm_private_pp *private_pp)
 
                        if (tdm_ttrace_module & TDM_TTRACE_PP) {
                                tbm_bo bo = tbm_surface_internal_get_bo(b->dst, 0);
-                               TDM_TRACE_ASYNC_END((int)private_pp, "[PP] %d", tbm_bo_export(bo));
+                               TDM_TRACE_ASYNC_END((intptr_t)private_pp, "[PP] %d", tbm_bo_export(bo));
                        }
 
                        tdm_buffer_unref_backend(b->src);
@@ -402,7 +402,7 @@ tdm_pp_destroy_internal(tdm_private_pp *private_pp)
 
                        if (tdm_ttrace_module & TDM_TTRACE_PP) {
                                tbm_bo bo = tbm_surface_internal_get_bo(b->dst, 0);
-                               TDM_TRACE_ASYNC_END((int)private_pp, "[PP] %d", tbm_bo_export(bo));
+                               TDM_TRACE_ASYNC_END((intptr_t)private_pp, "[PP] %d", tbm_bo_export(bo));
                        }
 
                        tdm_buffer_unref_backend(b->src);
@@ -579,7 +579,7 @@ tdm_pp_attach(tdm_pp *pp, tbm_surface_h src, tbm_surface_h dst)
 
        if (tdm_ttrace_module & TDM_TTRACE_PP) {
                tbm_bo bo = tbm_surface_internal_get_bo(dst, 0);
-               TDM_TRACE_ASYNC_BEGIN((int)pp, "[PP] %d", tbm_bo_export(bo));
+               TDM_TRACE_ASYNC_BEGIN((intptr_t)pp, "[PP] %d", tbm_bo_export(bo));
        }
 
        _pthread_mutex_unlock(&private_display->lock);