changeset 3788:c60b54937cfe

[project @ 2001-02-07 18:46:35 by jwe]
author jwe
date Wed, 07 Feb 2001 18:46:36 +0000
parents 5fea33691021
children 2a257be5e488
files ChangeLog acconfig.h config.h.bot
diffstat 3 files changed, 27 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Feb 07 18:24:37 2001 +0000
+++ b/ChangeLog	Wed Feb 07 18:46:36 2001 +0000
@@ -1,5 +1,8 @@
 2001-02-07  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* acconfig.h: Merge contents of config.h.bot.
+	* config.h.bot: Delete.
+
 	* autogen.sh: Allow running of autoconf or autoheader to be skipped.
 
 2001-02-06  John W. Eaton  <jwe@bevo.che.wisc.edu>
--- a/acconfig.h	Wed Feb 07 18:24:37 2001 +0000
+++ b/acconfig.h	Wed Feb 07 18:46:36 2001 +0000
@@ -137,3 +137,27 @@
    If you're adding to this file, keep in mind:
    The entries are in sort -df order: alphabetical, case insensitive,
    ignoring punctuation (such as underscores).  */
+
+@BOTTOM@
+
+#if defined (__GNUC__)
+#define GCC_ATTR_NORETURN __attribute__ ((__noreturn__))
+#define GCC_ATTR_UNUSED __attribute__ ((__unused__))
+#else
+#define GCC_ATTR_NORETURN
+#define GCC_ATTR_UNUSED
+#endif
+
+#define CONST_CAST(T, E) (T) (E)
+
+#define DYNAMIC_CAST(T, E) (T) (E)
+
+#define REINTERPRET_CAST(T, E) (T) (E)
+
+#define STATIC_CAST(T, E) (T) (E)
+
+#define X_CAST(T, E) (T) (E)
+
+#define HEAVYWEIGHT_INDEXING 1
+
+#define WITH_KPATHSEARCH 1
--- a/config.h.bot	Wed Feb 07 18:24:37 2001 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-
-#if defined (__GNUC__)
-#define GCC_ATTR_NORETURN __attribute__ ((__noreturn__))
-#define GCC_ATTR_UNUSED __attribute__ ((__unused__))
-#else
-#define GCC_ATTR_NORETURN
-#define GCC_ATTR_UNUSED
-#endif
-
-#define CONST_CAST(T, E) (T) (E)
-
-#define DYNAMIC_CAST(T, E) (T) (E)
-
-#define REINTERPRET_CAST(T, E) (T) (E)
-
-#define STATIC_CAST(T, E) (T) (E)
-
-#define X_CAST(T, E) (T) (E)
-
-#define HEAVYWEIGHT_INDEXING 1
-
-#define WITH_KPATHSEARCH 1