From d8728d7219ceb91d9bddda4064d91f83558b44b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Sat, 14 Apr 2007 17:25:54 +0200
Subject: Check for __malloc__ attribute during configure stage, avoid
 conditional in xineutils.h for it, instead use XINE_MALLOC.

---
 src/xine-utils/attributes.h |  6 ++++++
 src/xine-utils/xineutils.h  | 12 ++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/xine-utils/attributes.h b/src/xine-utils/attributes.h
index 649c1aa43..e257a48dd 100644
--- a/src/xine-utils/attributes.h
+++ b/src/xine-utils/attributes.h
@@ -75,4 +75,10 @@
 # define XINE_PACKED
 #endif
 
+#ifdef SUPPORT_ATTRIBUTE_MALLOC
+# define XINE_MALLOC __attributes__((__malloc__))
+#else
+# define XINE_MALLOC
+#endif
+
 #endif /* ATTRIBUTE_H_ */
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 20c3cb2dc..0be29ff63 100644
--- a/src/xine-utils/xineutils.h
+++ b/src/xine-utils/xineutils.h
@@ -624,17 +624,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;
 
-#if !defined(__GNUC__) || __GNUC__ < 3
-void *xine_xcalloc(size_t nmemb, size_t size) XINE_PROTECTED;
-#else
-void *xine_xcalloc(size_t nmemb, size_t size) __attribute__ ((__malloc__)) XINE_PROTECTED;
-#endif
+void *xine_xcalloc(size_t nmemb, size_t size) XINE_MALLOC XINE_PROTECTED;
 
 /*
  * Same as above, but memory is aligned to 'alignement'.
-- 
cgit v1.2.3