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

diff --git a/ir/adt/xmalloc.c b/ir/adt/xmalloc.c
index e44d8b0bf..07252a60d 100644
--- a/ir/adt/xmalloc.c
+++ b/ir/adt/xmalloc.c
@@ -14,51 +14,52 @@
    [reimplement xstrdup, ... ] */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <string.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
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
 
 #include "xmalloc.h"
-#include "panic.h"
+#include "error.h"
 
+static NORETURN xnomem(void) {
+  panic("out of memory");
+}
 
-void *
-(xmalloc) (size_t size)
-{
-  void *res = malloc (size);
+void *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)
-{
+void *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 ();
-
+  if (!res) xnomem();
   return res;
 }
 
-
-char *
-(xstrdup) (const char *str)
-{
+char *xstrdup(const char *str) {
   size_t len = strlen (str) + 1;
-  return memcpy ((xmalloc) (len), str, len);
-}
-
-
-void
-xnomem (void)
-{
-  panic ("out of memory");
+  return memcpy((xmalloc) (len), str, len);
 }