[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
synced Bison lib with gnulib
From: |
Paul Eggert |
Subject: |
synced Bison lib with gnulib |
Date: |
Sun, 9 Mar 2003 23:45:23 -0800 (PST) |
I installed this to sync Bison with gnulib.
2003-03-09 Paul Eggert <address@hidden>
* lib/strnlen.c, lib/mbswidth.h, lib/argmatch.c: Sync with gnulib.
--- strnlen.c 13 Dec 2002 11:24:16 -0000 1.4
+++ strnlen.c 10 Mar 2003 07:41:31 -0000 1.5
@@ -1,5 +1,5 @@
/* Find the length of STRING, but scan at most MAXLEN characters.
- Copyright (C) 1996, 1997, 1998, 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 2000-2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -20,16 +20,13 @@
#if HAVE_CONFIG_H
# include <config.h>
#endif
+#undef strnlen
#if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
-/* Temporarily redefine strnlen so that an inconsistent prototype
- (on at least AIX4.3.2.0 w/gcc-2.95.3) doesn't cause trouble. */
-# define strnlen system_strnlen
# include <string.h>
-# undef strnlen
#else
# include <strings.h>
#endif
@@ -43,6 +40,10 @@ char *memchr ();
#undef __strnlen
#undef strnlen
+
+#ifndef _LIBC
+# define strnlen rpl_strnlen
+#endif
#ifndef weak_alias
# define __strnlen strnlen
--- mbswidth.h 23 Nov 2002 07:08:51 -0000 1.2
+++ mbswidth.h 10 Mar 2003 07:41:31 -0000 1.3
@@ -1,5 +1,5 @@
/* Determine the number of screen columns needed for a string.
- Copyright (C) 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 2000-2003 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
@@ -17,6 +17,14 @@
#include <stddef.h>
+/* Avoid a clash of our mbswidth() with a function of the same name defined
+ in UnixWare 7.1.1 <wchar.h>. We need this #include before the #define
+ below. */
+#if HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+
+
/* Optional flags to influence mbswidth/mbsnwidth behavior. */
/* If this bit is set, return -1 upon finding an invalid or incomplete
@@ -27,6 +35,7 @@
Otherwise, assume unprintable characters have width 0 if they are
control characters and 1 otherwise. */
#define MBSW_REJECT_UNPRINTABLE 2
+
/* Returns the number of screen columns needed for STRING. */
#define mbswidth gnu_mbswidth /* avoid clash with UnixWare 7.1.1 function */
--- argmatch.c 22 Nov 2002 00:30:58 -0000 1.5
+++ argmatch.c 10 Mar 2003 07:35:12 -0000 1.6
@@ -1,5 +1,7 @@
/* argmatch.c -- find a match for a string in an array
- Copyright (C) 1990, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+
+ Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003 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
@@ -42,6 +44,10 @@
literal_quoting_style. */
#ifndef ARGMATCH_QUOTING_STYLE
# define ARGMATCH_QUOTING_STYLE locale_quoting_style
+#endif
+
+#ifndef EXIT_FAILURE
+# define EXIT_FAILURE 1
#endif
/* Non failing version of argmatch call this function after failing. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- synced Bison lib with gnulib,
Paul Eggert <=