DataTypes.h is now output from configure, and shortened

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11778 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/Support/DataTypes.h b/include/Support/DataTypes.h
deleted file mode 100644 (file)
index a93919d..0000000
--- a/include/Support/DataTypes.h
+++ /dev/null
@@ -1,52 +0,0 @@
-//===-- include/Support/DataTypes.h - Define fixed size types ---*- C++ -*-===//
-// 
-//                     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.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file contains definitions to figure out the size of _HOST_ data types.
-// This file is important because different host OS's define different macros,
-// which makes portability tough.  This file exports the following definitions:
-//
-//   int64_t       : is a typedef for the signed 64 bit system type
-//   uint64_t      : is a typedef for the unsigned 64 bit system type
-//   INT64_MAX     : is a #define specifying the max value for int64_t's
-//
-// No library is required when using these functinons.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef SUPPORT_DATATYPES_H
-#define SUPPORT_DATATYPES_H
-
-#include "Config/config.h"
-
-// Note that this header's correct operation depends on __STDC_LIMIT_MACROS
-// being defined.  We would define it here, but in order to prevent Bad Things
-// happening when system headers or C++ STL headers include stdint.h before
-// we define it here, we define it on the g++ command line (in Makefile.rules).
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#if !defined(INT64_MAX)
-/* We couldn't determine INT64_MAX; default it. */
-#define INT64_MAX 9223372036854775807LL
-#endif
-#if !defined(UINT64_MAX)
-#define UINT64_MAX 0xffffffffffffffffULL
-#endif
-
-#endif  /* SUPPORT_DATATYPES_H */

diff --git a/include/Support/DataTypes.h.in b/include/Support/DataTypes.h.in
new file mode 100644 (file)
index 0000000..d01f8c2
--- /dev/null
+++ b/include/Support/DataTypes.h.in
@@ -0,0 +1,45 @@
+//===-- include/Support/DataTypes.h - Define fixed size types ---*- C++ -*-===//
+// 
+//                     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.
+// 
+//===----------------------------------------------------------------------===//
+//
+// This file contains definitions to figure out the size of _HOST_ data types.
+// This file is important because different host OS's define different macros,
+// which makes portability tough.  This file exports the following definitions:
+//
+//   int64_t       : is a typedef for the signed 64 bit system type
+//   uint64_t      : is a typedef for the unsigned 64 bit system type
+//   INT64_MAX     : is a #define specifying the max value for int64_t's
+//
+// No library is required when using these functinons.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SUPPORT_DATATYPES_H
+#define SUPPORT_DATATYPES_H
+
+// Note that this header's correct operation depends on __STDC_LIMIT_MACROS
+// being defined.  We would define it here, but in order to prevent Bad Things
+// happening when system headers or C++ STL headers include stdint.h before
+// we define it here, we define it on the g++ command line (in Makefile.rules).
+#if !defined(__STDC_LIMIT_MACROS)
+# error "Must #define __STDC_LIMIT_MACROS before #including Support/DataTypes.h"
+#endif
+
+// Note that <inttypes.h> includes <stdint.h>, if this is a C99 system.
+@INCLUDE_INTTYPES_H@
+@INCLUDE_SYS_TYPES_H@
+
+#if !defined(INT64_MAX)
+/* We couldn't determine INT64_MAX; default it. */
+# define INT64_MAX 9223372036854775807LL
+#endif
+#if !defined(UINT64_MAX)
+# define UINT64_MAX 0xffffffffffffffffULL
+#endif
+
+#endif  /* SUPPORT_DATATYPES_H */

diff --git a/include/llvm/Support/DataTypes.h.in b/include/llvm/Support/DataTypes.h.in
new file mode 100644 (file)
index 0000000..d01f8c2
--- /dev/null
+++ b/include/llvm/Support/DataTypes.h.in
@@ -0,0 +1,45 @@
+//===-- include/Support/DataTypes.h - Define fixed size types ---*- C++ -*-===//
+// 
+//                     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.
+// 
+//===----------------------------------------------------------------------===//
+//
+// This file contains definitions to figure out the size of _HOST_ data types.
+// This file is important because different host OS's define different macros,
+// which makes portability tough.  This file exports the following definitions:
+//
+//   int64_t       : is a typedef for the signed 64 bit system type
+//   uint64_t      : is a typedef for the unsigned 64 bit system type
+//   INT64_MAX     : is a #define specifying the max value for int64_t's
+//
+// No library is required when using these functinons.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SUPPORT_DATATYPES_H
+#define SUPPORT_DATATYPES_H
+
+// Note that this header's correct operation depends on __STDC_LIMIT_MACROS
+// being defined.  We would define it here, but in order to prevent Bad Things
+// happening when system headers or C++ STL headers include stdint.h before
+// we define it here, we define it on the g++ command line (in Makefile.rules).
+#if !defined(__STDC_LIMIT_MACROS)
+# error "Must #define __STDC_LIMIT_MACROS before #including Support/DataTypes.h"
+#endif
+
+// Note that <inttypes.h> includes <stdint.h>, if this is a C99 system.
+@INCLUDE_INTTYPES_H@
+@INCLUDE_SYS_TYPES_H@
+
+#if !defined(INT64_MAX)
+/* We couldn't determine INT64_MAX; default it. */
+# define INT64_MAX 9223372036854775807LL
+#endif
+#if !defined(UINT64_MAX)
+# define UINT64_MAX 0xffffffffffffffffULL
+#endif
+
+#endif  /* SUPPORT_DATATYPES_H */