r765 - in branches/stable/source/src/texk/web2c/pdftexdir: . regex

[karl at freefriends.org]

Author: karl
Date: 2017-02-16 16:23:42 +0000 (Thu, 16 Feb 2017)
New Revision: 765

Modified:
   branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
   branches/stable/source/src/texk/web2c/pdftexdir/regex/regex_internal.h
Log:
if alloca is already defined, do nothing

Modified: branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog	2016-11-04 23:29:20 UTC (rev 764)
+++ branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog	2017-02-16 16:23:42 UTC (rev 765)
@@ -1,3 +1,9 @@
+2017-02-02  Karl Berry  <karl at freefriends.org>
+
+	* regex/regex_internal.h (alloca) [!alloca]: do not try
+	to #define if already #defined.
+	Report from Vincent Torri on tex-live list, 7 Jul 2016 10:48:15.
+
 2016-06-12  Karl Berry  <karl at freefriends.org>
         and Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 

Modified: branches/stable/source/src/texk/web2c/pdftexdir/regex/regex_internal.h
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/regex/regex_internal.h	2016-11-04 23:29:20 UTC (rev 764)
+++ branches/stable/source/src/texk/web2c/pdftexdir/regex/regex_internal.h	2017-02-16 16:23:42 UTC (rev 765)
@@ -1,4 +1,5 @@
 /* Extended regular expression matching and search library.
+   Copyright (C) 2017 Karl Berry <tex-live at 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 at yamato.ibm.com>.
@@ -420,6 +421,7 @@
 #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 @@
 #else
 # error No alloca()
 #endif
+#endif /* not alloca */
 
 #ifndef _LIBC
 # if HAVE_ALLOCA