Regen.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index ff05bc82e9857d3988fe2a7af2ca0860499116ca..b1d15424b7a1f2ebfaa82847ec2d634e53846529 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -26,16 +26,6 @@
 
 #include <assert.h>
 
 
 #include <assert.h>
 

-#ifdef MSDOS
-# include <io.h>
-#endif
-
-#ifdef _MSC_VER
-# include <stdlib.h>
-# include <process.h>
-# define getpid _getpid
-#endif
-

 #if HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
 #if HAVE_STDLIB_H
 # include <stdlib.h>
 #endif


@@ -62,9 +52,6 @@
 # if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
 #  include <memory.h>
 # endif /* not STDC_HEADERS and HAVE_MEMORY_H */
 # if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
 #  include <memory.h>
 # endif /* not STDC_HEADERS and HAVE_MEMORY_H */

-# ifndef bcopy
-#  define bcopy(src, dst, num) memcpy((dst), (src), (num))
-# endif

 #else /* not STDC_HEADERS and not HAVE_STRING_H */
 # include <strings.h>
 /* memory.h and strings.h conflict on some systems.  */
 #else /* not STDC_HEADERS and not HAVE_STRING_H */
 # include <strings.h>
 /* memory.h and strings.h conflict on some systems.  */


@@ -102,6 +89,9 @@ char *alloca ();
 
 # include "xalloc.h"
 
 
 # include "xalloc.h"
 

+/* From xstrndup.c.  */
+char *xstrndup PARAMS ((const char *s, size_t n));
+

 /*---------------------.
 | Missing prototypes.  |
 `---------------------*/
 /*---------------------.
 | Missing prototypes.  |
 `---------------------*/


@@ -110,14 +100,26 @@ char *alloca ();
 char *stpcpy PARAMS ((char *dest, const char *src));
 #endif
 
 char *stpcpy PARAMS ((char *dest, const char *src));
 #endif
 

+#if !HAVE_DECL_STRCHR
+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_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_STRNLEN
 size_t strnlen PARAMS ((const char *s, size_t maxlen));
 #endif
 
 #if !HAVE_DECL_STRNLEN
 size_t strnlen PARAMS ((const char *s, size_t maxlen));
 #endif
 

+#if !HAVE_DECL_MEMCHR
+void *memchr(const void *s, int c, size_t n);
+#endif
+

 
 
 /*-----------------.
 
 
 /*-----------------.


@@ -149,7 +151,7 @@ size_t strnlen PARAMS ((const char *s, size_t maxlen));
 # define setlocale(Category, Locale)
 #endif
 
 # define setlocale(Category, Locale)
 #endif
 

-#include "intl/libgettext.h"
+#include "libgettext.h"

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


@@ -307,4 +309,4 @@ do {                                                \
 #  include <dmalloc.h>
 # endif /* WITH_DMALLOC */
 
 #  include <dmalloc.h>
 # endif /* WITH_DMALLOC */
 

-#endif  /* BISON_SYSTEM_H */
+#endif  /* ! BISON_SYSTEM_H */