mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
bd8f005583
Since commit56a1a3ab("Silence GCC's \"cast of pointer to integer of a different size\" warning", 26-10-2015), sparse has been issuing a macro redefinition warning for the SIZE_MAX macro. However, gcc did not issue any such warning. After commit56a1a3ab, in terms of the order of #includes and #defines, the code looked something like: $ cat -n junk.c 1 #include <stddef.h> 2 3 #define SIZE_MAX ((size_t) -1) 4 5 #include <stdint.h> 6 7 int main(int argc, char *argv[]) 8 { 9 return 0; 10 } $ $ gcc junk.c $ However, if you compile that file with -Wsystem-headers, then it will also issue a warning. Having set -Wsystem-headers in CFLAGS, using the config.mak file, then (on cygwin): $ make compat/regex/regex.o CC compat/regex/regex.o In file included from /usr/lib/gcc/x86_64-pc-cygwin/4.9.3/include/stdint.h:9:0, from compat/regex/regcomp.c:21, from compat/regex/regex.c:77: /usr/include/stdint.h:362:0: warning: "SIZE_MAX" redefined #define SIZE_MAX (__SIZE_MAX__) ^ In file included from compat/regex/regex.c:69:0: compat/regex/regex_internal.h:108:0: note: this is the location of the previous definition # define SIZE_MAX ((size_t) -1) ^ $ The compilation of the compat/regex code is somewhat unusual in that the regex.c file directly #includes the other c files (regcomp.c, regexec.c and regex_internal.c). Commit56a1a3abadded an #include of <stdint.h> to the regcomp.c file, which results in the redefinition, since this is included after the regex_internal.h header. This header file contains a 'fallback' definition for SIZE_MAX, in order to support systems which do not have the <stdint.h> header (the HAVE_STDINT_H macro is not defined). In order to suppress the warning, we move the #include of <stdint.h> from regcomp.c to the start of the compilation unit, close to the top of regex.c, prior to the #include of the regex_internal.h header. Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
89 lines
3.1 KiB
C
89 lines
3.1 KiB
C
/* Extended regular expression matching and search library.
|
|
Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
/* Make sure no one compiles this code with a C++ compiler. */
|
|
#ifdef __cplusplus
|
|
# error "This is C code, use a C compiler"
|
|
#endif
|
|
|
|
#ifdef _LIBC
|
|
/* We have to keep the namespace clean. */
|
|
# define regfree(preg) __regfree (preg)
|
|
# define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef)
|
|
# define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags)
|
|
# define regerror(errcode, preg, errbuf, errbuf_size) \
|
|
__regerror(errcode, preg, errbuf, errbuf_size)
|
|
# define re_set_registers(bu, re, nu, st, en) \
|
|
__re_set_registers (bu, re, nu, st, en)
|
|
# define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \
|
|
__re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
|
|
# define re_match(bufp, string, size, pos, regs) \
|
|
__re_match (bufp, string, size, pos, regs)
|
|
# define re_search(bufp, string, size, startpos, range, regs) \
|
|
__re_search (bufp, string, size, startpos, range, regs)
|
|
# define re_compile_pattern(pattern, length, bufp) \
|
|
__re_compile_pattern (pattern, length, bufp)
|
|
# define re_set_syntax(syntax) __re_set_syntax (syntax)
|
|
# define re_search_2(bufp, st1, s1, st2, s2, startpos, range, regs, stop) \
|
|
__re_search_2 (bufp, st1, s1, st2, s2, startpos, range, regs, stop)
|
|
# define re_compile_fastmap(bufp) __re_compile_fastmap (bufp)
|
|
|
|
# include "../locale/localeinfo.h"
|
|
#endif
|
|
|
|
#if defined (_MSC_VER)
|
|
#include <stdio.h> /* for size_t */
|
|
#endif
|
|
|
|
/* On some systems, limits.h sets RE_DUP_MAX to a lower value than
|
|
GNU regex allows. Include it before <regex.h>, which correctly
|
|
#undefs RE_DUP_MAX and sets it to the right value. */
|
|
#include <limits.h>
|
|
#include <stdint.h>
|
|
|
|
#ifdef GAWK
|
|
#undef alloca
|
|
#define alloca alloca_is_bad_you_should_never_use_it
|
|
#endif
|
|
#include <regex.h>
|
|
#include "regex_internal.h"
|
|
|
|
#include "regex_internal.c"
|
|
#ifdef GAWK
|
|
#define bool int
|
|
#define true (1)
|
|
#define false (0)
|
|
#endif
|
|
#include "regcomp.c"
|
|
#include "regexec.c"
|
|
|
|
/* Binary backward compatibility. */
|
|
#if _LIBC
|
|
# include <shlib-compat.h>
|
|
# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3)
|
|
link_warning (re_max_failures, "the 're_max_failures' variable is obsolete and will go away.")
|
|
int re_max_failures = 2000;
|
|
# endif
|
|
#endif
|