* src/file.h (BISON_SIMPLE, BISON_HAIRY): Move from here...

* src/system.h (BISON_SIMPLE, BISON_HAIRY): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 540f32507d4353d06ef95f7317a4a0884ff0a7b4..a9541648fa50a4c09dc3914432b84ae7c9419b5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-19  Akim Demaille  <akim@epita.fr>
+
+       * src/file.h (BISON_SIMPLE, BISON_HAIRY): Move from here...
+       * src/system.h (BISON_SIMPLE, BISON_HAIRY): ... to here.
+
 2000-12-19  Akim Demaille  <akim@epita.fr>
 
        * src/files.c (open_files): Yipee!  We no longer need all the code

diff --git a/src/files.c b/src/files.c
index d4e781324afc28058bea8b1a68b3eccae02cdbb4..ccb47182b4f81d88fb1c499f38f880d41b3cf537 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -20,25 +20,6 @@
 
 
 #include "system.h"
-
-#if defined (VMS) & !defined (__VMS_POSIX)
-# ifndef BISON_SIMPLE
-#  define BISON_SIMPLE "GNU_BISON:[000000]BISON.SIMPLE"
-# endif
-# ifndef BISON_HAIRY
-#  define BISON_HARIRY "GNU_BISON:[000000]BISON.HAIRY"
-# endif
-#endif
-
-#if defined (_MSC_VER)
-# ifndef BISON_SIMPLE
-#  define BISON_SIMPLE "c:/usr/local/lib/bison.simple"
-# endif
-# ifndef BISON_HAIRY
-#  define BISON_HAIRY "c:/usr/local/lib/bison.hairy"
-# endif
-#endif
-
 #include "getargs.h"
 #include "files.h"
 #include "xalloc.h"
@@ -181,9 +162,6 @@ void
 open_files (void)
 {
   char *name_base;
-#ifdef MSDOS
-  register char *cp;
-#endif
   int base_length;
   int short_base_length;
 

diff --git a/src/system.h b/src/system.h
index 437c1f15920ad1e3a6e9a0555a6dc1e97c017c73..fbb298bcff7873d50f635f37abafd08197cbab33 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -219,3 +219,21 @@ do {                                                       \
 #  define EXT_GUARD_C  ".guard.c"
 # endif /* ! MSDOS */
 #endif /* ! VMS */
+
+#if defined (VMS) & !defined (__VMS_POSIX)
+# ifndef BISON_SIMPLE
+#  define BISON_SIMPLE "GNU_BISON:[000000]BISON.SIMPLE"
+# endif
+# ifndef BISON_HAIRY
+#  define BISON_HARIRY "GNU_BISON:[000000]BISON.HAIRY"
+# endif
+#endif
+
+#if defined (_MSC_VER)
+# ifndef BISON_SIMPLE
+#  define BISON_SIMPLE "c:/usr/local/lib/bison.simple"
+# endif
+# ifndef BISON_HAIRY
+#  define BISON_HAIRY "c:/usr/local/lib/bison.hairy"
+# endif
+#endif