Point to an official beta.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index f770b8f46245c57013dc7707bb3f27a3d1f871e8..6dd83bcfa97a1757ee96bc3b9cc8640299c906ee 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -89,6 +89,16 @@ char *alloca ();
 # endif
 #endif
 
 # endif
 #endif
 

+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+#ifndef SHRT_MIN
+# define SHRT_MIN (-32768)
+#endif
+#ifndef SHRT_MAX
+# define SHRT_MAX 32767
+#endif
+

 # include "xalloc.h"
 
 /* From xstrndup.c.  */
 # include "xalloc.h"
 
 /* From xstrndup.c.  */


@@ -106,10 +116,6 @@ char *stpcpy PARAMS ((char *dest, const char *src));
 char *strchr(const char *s, int c);
 #endif
 
 char *strchr(const char *s, int c);
 #endif
 

-#if !HAVE_DECL_STRNDUP
-char *strndup PARAMS ((const char *s, size_t size));
-#endif
-

 #if !HAVE_DECL_STRSPN
 size_t strspn(const char *s, const char *accept);
 #endif
 #if !HAVE_DECL_STRSPN
 size_t strspn(const char *s, const char *accept);
 #endif


@@ -158,7 +164,7 @@ void *memrchr PARAMS ((const void *s, int c, size_t n));
 # define setlocale(Category, Locale)
 #endif
 
 # define setlocale(Category, Locale)
 #endif
 

-#include "libgettext.h"
+#include "gettext.h"

 #define _(Msgid)  gettext (Msgid)
 #define N_(Msgid) (Msgid)
 
 #define _(Msgid)  gettext (Msgid)
 #define N_(Msgid) (Msgid)
 


@@ -223,23 +229,6 @@ do {                                                               \
 } while (0)
 
 
 } while (0)
 
 

-/*---------------------------------.
-| Machine-dependencies for Bison.  |
-`---------------------------------*/
-
-#ifdef eta10
-# define       MAXSHORT        2147483647
-# define       MINSHORT        -2147483648
-#else
-# define       MAXSHORT        32767
-# define       MINSHORT        -32768
-#endif
-
-#if defined (MSDOS) && !defined (__GO32__)
-# define MAXTABLE      16383
-#else
-# define MAXTABLE      32767
-#endif

 
 /*-----------------------------------------.
 | Extensions to use for the output files.  |
 
 /*-----------------------------------------.
 | Extensions to use for the output files.  |


@@ -273,13 +262,6 @@ do {                                                               \
 
 
 
 
 
 

-/*----------------------------.
-| As memcpy, but for shorts.  |
-`----------------------------*/
-
-#define shortcpy(Dest, Src, Num) \
-  memcpy (Dest, Src, Num * sizeof (short))
-

 /*---------------------.
 | Free a linked list.  |
 `---------------------*/
 /*---------------------.
 | Free a linked list.  |
 `---------------------*/