diff options
Diffstat (limited to 'src/xine-utils/xineutils.h')
| -rw-r--r-- | src/xine-utils/xineutils.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index 120cb3578..c7cfe980e 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.h @@ -621,11 +621,9 @@ void xine_profiler_print_results (void) XINE_PROTECTED; * Allocate and clean memory size_t 'size', then return the pointer * to the allocated memory. */ -#if !defined(__GNUC__) || __GNUC__ < 3 -void *xine_xmalloc(size_t size) XINE_PROTECTED; -#else -void *xine_xmalloc(size_t size) __attribute__ ((__malloc__)) XINE_PROTECTED; -#endif +void *xine_xmalloc(size_t size) XINE_MALLOC XINE_PROTECTED; + +void *xine_xcalloc(size_t nmemb, size_t size) XINE_MALLOC XINE_PROTECTED; /* * Same as above, but memory is aligned to 'alignement'. @@ -783,7 +781,7 @@ extern void yuy2_to_yuy2 int width, int height) XINE_PROTECTED; /* print a hexdump of the given data */ -void xine_hexdump (const char *buf, int length) XINE_PROTECTED; +void xine_hexdump (const void *buf, int length) XINE_PROTECTED; /* * Optimization macros for conditions |