Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync with gnulib.

Browse Source
This commit is contained in:
Paul Eggert
2003-03-10 07:41:31 +00:00
parent 6f7d430291
commit e13bcfbbbd
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/mbswidth.h
View File

@@ -1,5 +1,5 @@
/* Determine the number of screen columns needed for a string. /* 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 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 it under the terms of the GNU General Public License as published by
@@ -17,6 +17,14 @@
#include <stddef.h> #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. */ /* Optional flags to influence mbswidth/mbsnwidth behavior. */
/* If this bit is set, return -1 upon finding an invalid or incomplete /* If this bit is set, return -1 upon finding an invalid or incomplete
@@ -28,6 +36,7 @@
control characters and 1 otherwise. */ control characters and 1 otherwise. */
#define MBSW_REJECT_UNPRINTABLE 2 #define MBSW_REJECT_UNPRINTABLE 2
/* Returns the number of screen columns needed for STRING. */ /* Returns the number of screen columns needed for STRING. */
#define mbswidth gnu_mbswidth /* avoid clash with UnixWare 7.1.1 function */ #define mbswidth gnu_mbswidth /* avoid clash with UnixWare 7.1.1 function */
extern int mbswidth (const char *string, int flags); extern int mbswidth (const char *string, int flags);

11
lib/strnlen.c
View File

@@ -1,5 +1,5 @@
/* Find the length of STRING, but scan at most MAXLEN characters. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@@ -20,16 +20,13 @@
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#undef strnlen
#if HAVE_STRING_H #if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H # if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h> # include <memory.h>
# endif # 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> # include <string.h>
# undef strnlen
#else #else
# include <strings.h> # include <strings.h>
#endif #endif
@@ -44,6 +41,10 @@ char *memchr ();
#undef __strnlen #undef __strnlen
#undef strnlen #undef strnlen
#ifndef _LIBC
# define strnlen rpl_strnlen
#endif
#ifndef weak_alias #ifndef weak_alias
# define __strnlen strnlen # define __strnlen strnlen
#endif #endif