* src/system.h: Rely on HAVE_LIMITS_H.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 392f4eec49df9bac1c1473cd6accdd3da8312923..6dd83bcfa97a1757ee96bc3b9cc8640299c906ee 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,5 +1,5 @@
 /* system-dependent definitions for Bison.
 /* system-dependent definitions for Bison.

-   Copyright 2000, 2001  Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002  Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


@@ -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,33 +229,10 @@ 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       BITS_PER_WORD   16
-# define MAXTABLE      16383
-#else
-# define       BITS_PER_WORD   32
-# define MAXTABLE      32767
-#endif

 
 

-#define        WORDSIZE(n)     (((n) + BITS_PER_WORD - 1) / BITS_PER_WORD)
-#define        SETBIT(x, i)    ((x)[(i)/BITS_PER_WORD] |= (1<<((i) % BITS_PER_WORD)))
-#define RESETBIT(x, i) ((x)[(i)/BITS_PER_WORD] &= ~(1<<((i) % BITS_PER_WORD)))
-#define BITISSET(x, i) (((x)[(i)/BITS_PER_WORD] & (1<<((i) % BITS_PER_WORD))) != 0)
-
-
-/* Extensions to use for the output files. */
+/*-----------------------------------------.
+| Extensions to use for the output files.  |
+`-----------------------------------------*/

 
 #ifdef VMS
   /* VMS. */
 
 #ifdef VMS
   /* VMS. */


@@ -273,11 +256,16 @@ do {                                                              \
 # endif /* ! MSDOS */
 #endif /* ! VMS */
 
 # endif /* ! MSDOS */
 #endif /* ! VMS */
 

-/* As memcpy, but for shorts.  */
-#define shortcpy(Dest, Src, Num) \
-  memcpy (Dest, Src, Num * sizeof (short))
+#ifndef DEFAULT_TMPDIR
+# define DEFAULT_TMPDIR "/tmp"
+#endif
+
+
+
+/*---------------------.
+| Free a linked list.  |
+`---------------------*/

 
 

-/* Free a linked list. */

 #define LIST_FREE(Type, List)                  \
 do {                                           \
   Type *_node, *_next;                         \
 #define LIST_FREE(Type, List)                  \
 do {                                           \
   Type *_node, *_next;                         \


@@ -288,9 +276,10 @@ do {                                               \
     }                                          \
 } while (0)
 
     }                                          \
 } while (0)
 

-/*---------------------------------.
-| Debugging the memory allocator.  |
-`---------------------------------*/
+
+/*---------------------------------------------.
+| Debugging memory allocation (must be last).  |
+`---------------------------------------------*/

 
 # if WITH_DMALLOC
 #  define DMALLOC_FUNC_CHECK
 
 # if WITH_DMALLOC
 #  define DMALLOC_FUNC_CHECK