summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/pdftexdir/regex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-02-16 16:32:45 +0000
committerKarl Berry <karl@freefriends.org>2017-02-16 16:32:45 +0000
commit9c60225ff88d96c6e969e4eb98a56832c21ac74f (patch)
tree363c2cd627fbde83ba0a6438152b2cac2d0a0764 /Build/source/texk/web2c/pdftexdir/regex
parent11e693ea9429803692ac37826ee183c068ffa67e (diff)
avoid re-#define alloca, pdftex r765
git-svn-id: svn://tug.org/texlive/trunk@43243 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/pdftexdir/regex')
-rw-r--r--Build/source/texk/web2c/pdftexdir/regex/regex_internal.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/regex/regex_internal.h b/Build/source/texk/web2c/pdftexdir/regex/regex_internal.h
index b0c4d355abb..6b6abca9e6d 100644
--- a/Build/source/texk/web2c/pdftexdir/regex/regex_internal.h
+++ b/Build/source/texk/web2c/pdftexdir/regex/regex_internal.h
@@ -1,4 +1,5 @@
/* Extended regular expression matching and search library.
+ Copyright (C) 2017 Karl Berry <tex-live@tug.org>
Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
@@ -420,6 +421,7 @@ static unsigned int re_string_context_at (const re_string_t *input, int idx,
#define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
#define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
+#ifndef alloca /* if alloca is already defined, fine */
#ifdef __GNUC__
# define alloca(size) __builtin_alloca (size)
# define HAVE_ALLOCA 1
@@ -430,6 +432,7 @@ static unsigned int re_string_context_at (const re_string_t *input, int idx,
#else
# error No alloca()
#endif
+#endif /* not alloca */
#ifndef _LIBC
# if HAVE_ALLOCA