X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fxmalloc.c;h=b16e44176b584f96d36c72a999b6a89cd9cf246c;hb=1a06a5a742509e6027ed64b8b28f95e22c00a006;hp=e44d8b0bff4d7336134188ebe736778a1e8a12ae;hpb=443b7297d1589123cde42bbd2571905e18d349be;p=libfirm

diff --git a/ir/adt/xmalloc.c b/ir/adt/xmalloc.c
index e44d8b0bf..b16e44176 100644
--- a/ir/adt/xmalloc.c
+++ b/ir/adt/xmalloc.c
@@ -14,51 +14,57 @@
    [reimplement xstrdup, ... ] */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
-#include <stdlib.h>
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+
+#include <stdlib.h>
 
 #include "xmalloc.h"
 #include "panic.h"
 
-
 void *
-(xmalloc) (size_t size)
-{
+xmalloc(size_t size) {
   void *res = malloc (size);
 
-  if (!res) xnomem ();
+  if (!res) xnomem();
+  return res;
+}
 
-  memset (res, 0x00, size);
+void *xcalloc(size_t num, size_t size) {
+  void *res = calloc(num, size);
 
+  if (!res) xnomem();
   return res;
 }
 
-
 void *
-(xrealloc) (void *ptr, size_t size)
-{
+xrealloc(void *ptr, size_t size) {
   /* ANSI blesses realloc (0, x) but SunOS chokes on it */
   void *res = ptr ? realloc (ptr, size) : malloc (size);
 
   if (!res) xnomem ();
-
   return res;
 }
 
 
 char *
-(xstrdup) (const char *str)
-{
+xstrdup(const char *str) {
   size_t len = strlen (str) + 1;
   return memcpy ((xmalloc) (len), str, len);
 }
 
 
 void
-xnomem (void)
-{
-  panic ("out of memory");
+xnomem(void) {
+  panic("out of memory");
 }