minor cleanups. Add provisions for a new standard BLOCKINFO_BLOCK

[oota-llvm.git] / include / llvm / Config / alloca.h

diff --git a/include/llvm/Config/alloca.h b/include/llvm/Config/alloca.h
index f27ef060dcb5113e2dddfe3562fcec3eb50fd863..10fa74d4ccc8f82690e065d77729a770f1a8c124 100644 (file)
--- a/include/llvm/Config/alloca.h
+++ b/include/llvm/Config/alloca.h
@@ -1,45 +1,49 @@
 /*
- * Header file: alloc.h
+ *                     The LLVM Compiler Infrastructure
+ *
+ * This file was developed by the LLVM research group and is distributed under
+ * the University of Illinois Open Source License. See LICENSE.TXT for details.
+ *
+ ******************************************************************************
  *
  * Description:
- *     This header file includes the infamous alloc.h header file if the
- *     autoconf system has found it.  It hides all of the autoconf details
- *     from the rest of the application source code.
+ *  This header file includes the infamous alloc.h header file if the
+ *  autoconf system has found it.  It hides all of the autoconf details
+ *  from the rest of the application source code.
  */
 
 #ifndef _CONFIG_ALLOC_H
 #define _CONFIG_ALLOC_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 /*
  * This is a modified version of that suggested by the Autoconf manual.
- *     1) The #pragma is indented so that pre-ANSI C compilers ignore it.
- *     2) If alloca.h cannot be found, then try stdlib.h.  Some platforms
- *        (notably FreeBSD) defined alloca() there.
+ *  1) The #pragma is indented so that pre-ANSI C compilers ignore it.
+ *  2) If alloca.h cannot be found, then try stdlib.h.  Some platforms
+ *     (notably FreeBSD) defined alloca() there.
  */
-#ifndef __GNUC__
-#      ifdef HAVE_ALLOCA_H
-#              include <alloca.h>
-#      else
-#              ifdef _AIX
- #                     pragma alloca
-#              else
-#                      ifndef alloca
-                               char * alloca ();
-#                      endif
-#              endif
-#      endif
+#ifdef _MSC_VER
+#include <malloc.h>
+#define alloca _alloca
+#elif defined(HAVE_ALLOCA_H)
+#include <alloca.h>
+#elif defined(__MINGW32__) && defined(HAVE_MALLOC_H)
+#include <malloc.h>
+#elif !defined(__GNUC__)
+# ifdef _AIX
+#   pragma alloca
+# else
+#   ifndef alloca
+      char * alloca ();
+#   endif
+# endif
 #else
-#      ifdef HAVE_ALLOCA_H
-#              include <alloca.h>
-#      else
-#              ifdef HAVE_STDLIB_H
-#                      include <stdlib.h>
-#              else
-#                      error "The function alloca() is required but not found!"
-#              endif
-#      endif
+# ifdef HAVE_STDLIB_H
+#   include <stdlib.h>
+# else
+#   error "The function alloca() is required but not found!"
+# endif
 #endif
 
 #endif