From: Ilyes Gouta <ilyes.go...@st.com>
As __no_instrument_function__ doesn't have a name space.
The symbol __no_instrument_function__ used to be located in
direct/os/linux/glibc/types.h which gets included by directfb.h.
DirectFB api users could have a conflicting (re)definition of that same symbol.
Signed-off-by: Ilyes Gouta <ilyes.go...@st.com>
---
lib/direct/clock.c | 8 ++++----
lib/direct/debug.c | 12 ++++++------
lib/direct/interface.c | 8 ++++----
lib/direct/log.c | 8 ++++----
lib/direct/log_domain.c | 8 ++++----
lib/direct/mem.c | 2 +-
lib/direct/messages.c | 18 +++++++++---------
lib/direct/os/linux/glibc/types.h | 2 +-
lib/direct/os/tls.h | 8 ++++----
lib/direct/os/win32/clock_win32.c | 2 +-
lib/direct/os/win32/log_win32.c | 4 ++--
lib/direct/os/win32/mem_win32.c | 26 +++++++++++++-------------
lib/direct/os/win32/system_win32.c | 2 +-
lib/direct/os/win32/thread_win32.c | 2 +-
lib/direct/os/win32/types.h | 2 +-
lib/direct/util.c | 2 +-
16 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/lib/direct/clock.c b/lib/direct/clock.c
index d8f1ec0..e394c6a 100644
--- a/lib/direct/clock.c
+++ b/lib/direct/clock.c
@@ -36,28 +36,28 @@ D_LOG_DOMAIN( Direct_Clock, "Direct/Clock", "Time
measurement etc." );
/**********************************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
long long
direct_clock_get_micros( void )
{
return direct_clock_get_time( DIRECT_CLOCK_SESSION );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
long long
direct_clock_get_millis( void )
{
return direct_clock_get_time( DIRECT_CLOCK_SESSION ) / 1000LL;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
long long
direct_clock_get_abs_micros( void )
{
return direct_clock_get_time( DIRECT_CLOCK_REALTIME );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
long long
direct_clock_get_abs_millis( void )
{
diff --git a/lib/direct/debug.c b/lib/direct/debug.c
index 2fd2072..1117e7e 100644
--- a/lib/direct/debug.c
+++ b/lib/direct/debug.c
@@ -48,7 +48,7 @@
#if DIRECT_BUILD_DEBUGS /* Build with debug support? */
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_debug_log( DirectLogDomain *domain,
unsigned int debug_level, /* 1-9, 0 = info */
@@ -63,7 +63,7 @@ direct_debug_log( DirectLogDomain *domain,
va_end( ap );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_debug_at( DirectLogDomain *domain,
const char *format, ... )
@@ -77,7 +77,7 @@ direct_debug_at( DirectLogDomain *domain,
#endif /* DIRECT_BUILD_DEBUGS */
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_debug_at_always( DirectLogDomain *domain,
const char *format, ... )
@@ -93,7 +93,7 @@ direct_debug_at_always( DirectLogDomain *domain,
#if DIRECT_BUILD_DEBUGS /* Build with debug support? */
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_break( const char *func,
const char *file,
@@ -123,7 +123,7 @@ direct_break( const char *func,
direct_trap( "Break", SIGABRT );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_assertion( const char *exp,
const char *func,
@@ -144,7 +144,7 @@ direct_assertion( const char *exp,
direct_trap( "Assertion", SIGTRAP );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_assumption( const char *exp,
const char *func,
diff --git a/lib/direct/interface.c b/lib/direct/interface.c
index 1a5a926..faaecd5 100644
--- a/lib/direct/interface.c
+++ b/lib/direct/interface.c
@@ -522,7 +522,7 @@ direct_print_interface_leaks( void )
/**************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
static InterfaceDesc *
allocate_interface_desc( void )
{
@@ -543,7 +543,7 @@ allocate_interface_desc( void )
return &alloc_list[alloc_count++];
}
-__no_instrument_function__
+__dfb_no_instrument_function__
static __inline__ void
fill_interface_desc( InterfaceDesc *desc,
const void *interface_ptr,
@@ -565,7 +565,7 @@ fill_interface_desc( InterfaceDesc *desc,
/**************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_dbg_interface_add( const char *func,
const char *file,
@@ -586,7 +586,7 @@ direct_dbg_interface_add( const char *func,
direct_mutex_unlock( &alloc_lock );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_dbg_interface_remove( const char *func,
const char *file,
diff --git a/lib/direct/log.c b/lib/direct/log.c
index 4645939..0ec9189 100644
--- a/lib/direct/log.c
+++ b/lib/direct/log.c
@@ -128,7 +128,7 @@ direct_log_destroy( DirectLog *log )
return DR_OK;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
DirectResult
direct_log_printf( DirectLog *log,
const char *format, ... )
@@ -197,7 +197,7 @@ direct_log_set_default( DirectLog *log )
return DR_OK;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_log_lock( DirectLog *log )
{
@@ -211,7 +211,7 @@ direct_log_lock( DirectLog *log )
direct_mutex_lock( &log->lock );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_log_unlock( DirectLog *log )
{
@@ -262,7 +262,7 @@ direct_log_flush( DirectLog *log,
/**********************************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
DirectLog *
direct_log_default( void )
{
diff --git a/lib/direct/log_domain.c b/lib/direct/log_domain.c
index 9549722..33f9e8f 100644
--- a/lib/direct/log_domain.c
+++ b/lib/direct/log_domain.c
@@ -69,7 +69,7 @@ __D_log_domain_deinit()
/**********************************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
static __inline__ LogDomainEntry *
lookup_domain( const char *name, bool sub );
@@ -104,7 +104,7 @@ lookup_domain( const char *name, bool sub )
return NULL;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
static DirectLogLevel
check_domain( DirectLogDomain *domain );
@@ -207,7 +207,7 @@ direct_log_domain_check( DirectLogDomain *domain )
/* FIXME: merge following */
-__no_instrument_function__
+__dfb_no_instrument_function__
DirectResult
direct_log_domain_vprintf( DirectLogDomain *domain,
DirectLogLevel level,
@@ -268,7 +268,7 @@ direct_log_domain_vprintf( DirectLogDomain *domain,
return DR_OK;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
DirectResult
direct_log_domain_log( DirectLogDomain *domain,
DirectLogLevel level,
diff --git a/lib/direct/mem.c b/lib/direct/mem.c
index 401e4c8..ac064da 100644
--- a/lib/direct/mem.c
+++ b/lib/direct/mem.c
@@ -121,7 +121,7 @@ direct_print_memleaks( void )
/**********************************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
static __inline__ MemDesc *
fill_mem_desc( MemDesc *desc, int bytes, const char *func, const char *file,
int line, DirectTraceBuffer *trace )
{
diff --git a/lib/direct/messages.c b/lib/direct/messages.c
index 0331e68..be3148b 100644
--- a/lib/direct/messages.c
+++ b/lib/direct/messages.c
@@ -40,7 +40,7 @@
#if DIRECT_BUILD_TEXT
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_info( const char *format, ... )
{
@@ -57,7 +57,7 @@ direct_messages_info( const char *format, ... )
direct_log_printf( NULL, "(*) %s", buf );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_error( const char *format, ... )
{
@@ -76,7 +76,7 @@ direct_messages_error( const char *format, ... )
direct_trace_print_stack( NULL );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_derror( DirectResult result, const char *format, ... )
{
@@ -95,7 +95,7 @@ direct_messages_derror( DirectResult result, const char
*format, ... )
direct_trace_print_stack( NULL );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_perror( int erno, const char *format, ... )
{
@@ -114,7 +114,7 @@ direct_messages_perror( int erno, const char *format, ... )
direct_trace_print_stack( NULL );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_dlerror( const char *dlerr, const char *format, ... )
{
@@ -133,7 +133,7 @@ direct_messages_dlerror( const char *dlerr, const char
*format, ... )
direct_trace_print_stack( NULL );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_once( const char *func,
const char *file,
@@ -155,7 +155,7 @@ direct_messages_once( const char *func,
direct_trace_print_stack( NULL );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_unimplemented( const char *func,
const char *file,
@@ -166,7 +166,7 @@ direct_messages_unimplemented( const char *func,
direct_trace_print_stack( NULL );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_bug( const char *func,
const char *file,
@@ -188,7 +188,7 @@ direct_messages_bug( const char *func,
direct_trace_print_stack( NULL );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_warn( const char *func,
const char *file,
diff --git a/lib/direct/os/linux/glibc/types.h
b/lib/direct/os/linux/glibc/types.h
index acbfd58..0c992ee 100644
--- a/lib/direct/os/linux/glibc/types.h
+++ b/lib/direct/os/linux/glibc/types.h
@@ -74,7 +74,7 @@ typedef int64_t s64;
#define __inline__ inline
#define D_UNUSED __attribute__((unused))
-#define __no_instrument_function__ __attribute__((no_instrument_function))
+#define __dfb_no_instrument_function__ __attribute__((no_instrument_function))
#define __constructor__ __attribute__((constructor))
#define __destructor__ __attribute__((destructor))
#define __typeof__(x) typeof(x)
diff --git a/lib/direct/os/tls.h b/lib/direct/os/tls.h
index 3fef22c..ad08543 100644
--- a/lib/direct/os/tls.h
+++ b/lib/direct/os/tls.h
@@ -33,17 +33,17 @@
/**********************************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
static __inline__ void * direct_tls_get ( DirectTLS *tls );
-__no_instrument_function__
+__dfb_no_instrument_function__
static __inline__ DirectResult direct_tls_set ( DirectTLS *tls,
void *value );
-__no_instrument_function__
+__dfb_no_instrument_function__
static __inline__ DirectResult direct_tls_register ( DirectTLS *tls, void
(*destructor)( void* ) );
-__no_instrument_function__
+__dfb_no_instrument_function__
static __inline__ DirectResult direct_tls_unregister( DirectTLS *tls );
#endif
diff --git a/lib/direct/os/win32/clock_win32.c
b/lib/direct/os/win32/clock_win32.c
index 5043843..3bc098d 100644
--- a/lib/direct/os/win32/clock_win32.c
+++ b/lib/direct/os/win32/clock_win32.c
@@ -40,7 +40,7 @@ static long long session_clock_offset;
/**********************************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
long long
direct_clock_get_time( DirectClockType type )
{
diff --git a/lib/direct/os/win32/log_win32.c b/lib/direct/os/win32/log_win32.c
index ef9d948..a6ce5b3 100644
--- a/lib/direct/os/win32/log_win32.c
+++ b/lib/direct/os/win32/log_win32.c
@@ -33,7 +33,7 @@
/**********************************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
static DirectResult
log_write( DirectLog *log,
const char *buffer,
@@ -47,7 +47,7 @@ log_write( DirectLog *log,
/**********************************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
DirectResult
direct_log_init( DirectLog *log,
const char *param )
diff --git a/lib/direct/os/win32/mem_win32.c b/lib/direct/os/win32/mem_win32.c
index d374db1..eacb3cb 100644
--- a/lib/direct/os/win32/mem_win32.c
+++ b/lib/direct/os/win32/mem_win32.c
@@ -43,7 +43,7 @@
#define TOTAL_SENTINEL ((PREFIX_SENTINEL) + (SUFFIX_SENTINEL))
-__no_instrument_function__
+__dfb_no_instrument_function__
static inline void
install_sentinels( void *p, size_t size )
{
@@ -63,7 +63,7 @@ install_sentinels( void *p, size_t size )
suffix[i] = i;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
static inline void
remove_sentinels( void *p )
{
@@ -79,7 +79,7 @@ remove_sentinels( void *p )
suffix[i] = 0;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
static inline void
check_sentinels( void *p )
{
@@ -102,7 +102,7 @@ check_sentinels( void *p )
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void *
direct_malloc( size_t bytes )
{
@@ -116,7 +116,7 @@ direct_malloc( size_t bytes )
return p + PREFIX_SENTINEL;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void *
direct_calloc( size_t count, size_t bytes)
{
@@ -130,7 +130,7 @@ direct_calloc( size_t count, size_t bytes)
return p + PREFIX_SENTINEL;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void *
direct_realloc( void *mem, size_t bytes )
{
@@ -156,7 +156,7 @@ direct_realloc( void *mem, size_t bytes )
return p + PREFIX_SENTINEL;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
char *
direct_strdup( const char *str )
{
@@ -173,7 +173,7 @@ direct_strdup( const char *str )
return p + PREFIX_SENTINEL;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_free( void *mem )
{
@@ -192,35 +192,35 @@ direct_free( void *mem )
#else
-__no_instrument_function__
+__dfb_no_instrument_function__
void *
direct_malloc( size_t bytes )
{
return malloc( bytes );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void *
direct_calloc( size_t count, size_t bytes)
{
return calloc( count, bytes );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void *
direct_realloc( void *mem, size_t bytes )
{
return realloc( mem, bytes );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
char *
direct_strdup( const char *str )
{
return _strdup( str );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_free( void *mem )
{
diff --git a/lib/direct/os/win32/system_win32.c
b/lib/direct/os/win32/system_win32.c
index cbed316..250b06f 100644
--- a/lib/direct/os/win32/system_win32.c
+++ b/lib/direct/os/win32/system_win32.c
@@ -67,7 +67,7 @@ direct_getpid( void )
return GetCurrentThreadId();
}
-__no_instrument_function__
+__dfb_no_instrument_function__
pid_t
direct_gettid( void )
{
diff --git a/lib/direct/os/win32/thread_win32.c
b/lib/direct/os/win32/thread_win32.c
index 67774b8..b5a2a61 100644
--- a/lib/direct/os/win32/thread_win32.c
+++ b/lib/direct/os/win32/thread_win32.c
@@ -126,7 +126,7 @@ direct_thread_self( void )
return NULL;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
const char *
direct_thread_self_name( void )
{
diff --git a/lib/direct/os/win32/types.h b/lib/direct/os/win32/types.h
index 55790f6..e88cdab 100644
--- a/lib/direct/os/win32/types.h
+++ b/lib/direct/os/win32/types.h
@@ -89,7 +89,7 @@ struct timespec {
#define __inline__ __inline
#define D_UNUSED //__attribute__((unused))
-#define __no_instrument_function__ //__attribute__((no_instrument_function))
+#define __dfb_no_instrument_function__
//__attribute__((no_instrument_function))
#define __constructor__ //__attribute__((constructor))
#define __destructor__ //__attribute__((destructor))
#define __typeof__(x) void*
diff --git a/lib/direct/util.c b/lib/direct/util.c
index e9fccc3..8ec8fa9 100644
--- a/lib/direct/util.c
+++ b/lib/direct/util.c
@@ -110,7 +110,7 @@ direct_strerror( int erno )
/*
* translates errno to DirectResult
*/
-__no_instrument_function__
+__dfb_no_instrument_function__
DirectResult
errno2result( int erno )
{
--
1.7.9.5
_______________________________________________
directfb-dev mailing list
directfb-dev@directfb.org
http://mail.directfb.org/cgi-bin/mailman/listinfo/directfb-dev
