fix #38 remove alloc_size attribute when compiling with clang

parapluu · Dec 8, 2014 · 9c4d158 · 9c4d158
1 parent 91c04b0
commit 9c4d158
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/runtime/pony/inc/pony/pony.h b/src/runtime/pony/inc/pony/pony.h
@@ -162,7 +162,12 @@ void pony_continuation(pony_actor_t* to, uint64_t id,
  * This is garbage collected memory. This can only be done while an actor is
  * handling a message, so that there is a current actor.
  */
-void* pony_alloc(size_t size) __attribute__((malloc,alloc_size(1)));
+void* pony_alloc(size_t size) 
+#ifdef __clang__
+  __attribute__((malloc));
+#else
+  __attribute__((malloc, alloc_size(3)));
+#endif
 
 // TODO: pony_free() for when escape analysis shows a reference doesn't survive
 

diff --git a/src/runtime/pony/src/mem/heap.h b/src/runtime/pony/src/mem/heap.h
@@ -30,7 +30,11 @@ void heap_init(heap_t* heap);
 void heap_destroy(heap_t* heap);
 
 void* heap_alloc(pony_actor_t* actor, heap_t* heap, size_t size)
+#ifdef __clang__
+  __attribute__((malloc));
+#else
   __attribute__((malloc,alloc_size(3)));
+#endif
 
 /**
  * Adds to the used memory figure kept by the heap. This allows objects received