From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 22 Apr 2013 17:30:08 +0000 (-0400)
Subject: Fix warnings for 32-bit in lttng-ust-cyg-profile
X-Git-Tag: v2.2.0-rc2~9
X-Git-Url: http://git.liburcu.org/?p=lttng-ust.git;a=commitdiff_plain;h=df88bfbcf8da14f1d5bcc0264586443c7e9cbf83

Fix warnings for 32-bit in lttng-ust-cyg-profile

In file included from ../include/lttng/ust-tracepoint-event.h:357,
                 from ../include/lttng/tracepoint-event.h:62,
                 from lttng-ust-cyg-profile.h:63,
                 from lttng-ust-cyg-profile.c:27:
././lttng-ust-cyg-profile.h: In function ‘__event_prepare_filter_stack__lttng_ust_cyg_profile___func_entry’:
././lttng-ust-cyg-profile.h:35: warning: cast from pointer to integer of different size
././lttng-ust-cyg-profile.h:35: warning: cast from pointer to integer of different size
././lttng-ust-cyg-profile.h:35: warning: cast from pointer to integer of different size
././lttng-ust-cyg-profile.h:35: warning: cast from pointer to integer of different size
././lttng-ust-cyg-profile.h: In function ‘__event_prepare_filter_stack__lttng_ust_cyg_profile___func_exit’:
././lttng-ust-cyg-profile.h:46: warning: cast from pointer to integer of different size
././lttng-ust-cyg-profile.h:46: warning: cast from pointer to integer of different size
././lttng-ust-cyg-profile.h:46: warning: cast from pointer to integer of different size
././lttng-ust-cyg-profile.h:46: warning: cast from pointer to integer of different size
  CCLD   liblttng-ust-cyg-profile.la
  CC     lttng-ust-cyg-profile-fast.lo
In file included from ../include/lttng/ust-tracepoint-event.h:357,
                 from ../include/lttng/tracepoint-event.h:62,
                 from lttng-ust-cyg-profile-fast.h:59,
                 from lttng-ust-cyg-profile-fast.c:27:
././lttng-ust-cyg-profile-fast.h: In function ‘__event_prepare_filter_stack__lttng_ust_cyg_profile_fast___func_entry’:
././lttng-ust-cyg-profile-fast.h:35: warning: cast from pointer to integer of different size
././lttng-ust-cyg-profile-fast.h:35: warning: cast from pointer to integer of different size

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.h b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.h
index 2e6dda8e..43162925 100644
--- a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.h
+++ b/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.h
@@ -35,8 +35,10 @@ extern "C" {
 TRACEPOINT_EVENT(lttng_ust_cyg_profile, func_entry,
 	TP_ARGS(void *, func_addr, void *, call_site),
 	TP_FIELDS(
-		ctf_integer_hex(void *, addr, func_addr)
-		ctf_integer_hex(void *, call_site, call_site)
+		ctf_integer_hex(unsigned long, addr,
+			(unsigned long) func_addr)
+		ctf_integer_hex(unsigned long, call_site,
+			(unsigned long) call_site)
 	)
 )
 
@@ -46,8 +48,10 @@ TRACEPOINT_LOGLEVEL(lttng_ust_cyg_profile, func_entry,
 TRACEPOINT_EVENT(lttng_ust_cyg_profile, func_exit,
 	TP_ARGS(void *, func_addr, void *, call_site),
 	TP_FIELDS(
-		ctf_integer_hex(void *, addr, func_addr)
-		ctf_integer_hex(void *, call_site, call_site)
+		ctf_integer_hex(unsigned long, addr,
+			(unsigned long) func_addr)
+		ctf_integer_hex(unsigned long, call_site,
+			(unsigned long) call_site)
 	)
 )