mirror of
https://github.com/darlinghq/darling-gdb.git
synced 2024-11-27 22:10:32 +00:00
merge from gcc
This commit is contained in:
parent
c750388a85
commit
6038baea6c
@ -1,3 +1,12 @@
|
||||
2005-07-22 Ben Elliston <bje@gnu.org>
|
||||
|
||||
* getopt.c: Include "ansidecl.h".
|
||||
(_getopt_initialize): Mark argc and argv parameters as unused.
|
||||
|
||||
2005-07-22 Ben Elliston <bje@gnu.org>
|
||||
|
||||
* regex.c (regcomp): Change type of `i' from unsigned to int.
|
||||
|
||||
2005-07-22 Ben Elliston <bje@gnu.org>
|
||||
|
||||
Recover patch lost in the sourceware repository:
|
||||
|
@ -3,8 +3,8 @@
|
||||
"Keep this file name-space clean" means, talk to drepper@gnu.org
|
||||
before changing it!
|
||||
|
||||
Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98
|
||||
Free Software Foundation, Inc.
|
||||
Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
|
||||
1996, 1997, 1998, 2005 Free Software Foundation, Inc.
|
||||
|
||||
NOTE: This source is derived from an old version taken from the GNU C
|
||||
Library (glibc).
|
||||
@ -43,6 +43,7 @@
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include "ansidecl.h"
|
||||
|
||||
/* Comment out all this code if we are using the GNU C Library, and are not
|
||||
actually compiling the library itself. This code is part of the GNU C
|
||||
@ -397,7 +398,9 @@ exchange (char **argv)
|
||||
static const char *_getopt_initialize (int, char *const *, const char *);
|
||||
#endif
|
||||
static const char *
|
||||
_getopt_initialize (int argc, char *const *argv, const char *optstring)
|
||||
_getopt_initialize (int argc ATTRIBUTE_UNUSED,
|
||||
char *const *argv ATTRIBUTE_UNUSED,
|
||||
const char *optstring)
|
||||
{
|
||||
/* Start processing options with ARGV-element 1 (since ARGV-element 0
|
||||
is the program name); the sequence of previously skipped
|
||||
|
@ -7923,7 +7923,7 @@ regcomp (regex_t *preg, const char *pattern, int cflags)
|
||||
|
||||
if (cflags & REG_ICASE)
|
||||
{
|
||||
unsigned i;
|
||||
int i;
|
||||
|
||||
preg->translate
|
||||
= (RE_TRANSLATE_TYPE) malloc (CHAR_SET_SIZE
|
||||
@ -7933,7 +7933,7 @@ regcomp (regex_t *preg, const char *pattern, int cflags)
|
||||
|
||||
/* Map uppercase characters to corresponding lowercase ones. */
|
||||
for (i = 0; i < CHAR_SET_SIZE; i++)
|
||||
preg->translate[i] = ISUPPER (i) ? TOLOWER (i) : (int) i;
|
||||
preg->translate[i] = ISUPPER (i) ? TOLOWER (i) : i;
|
||||
}
|
||||
else
|
||||
preg->translate = NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user