diff options
author | Karl Berry <karl@freefriends.org> | 2017-02-16 16:32:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-02-16 16:32:45 +0000 |
commit | 9c60225ff88d96c6e969e4eb98a56832c21ac74f (patch) | |
tree | 363c2cd627fbde83ba0a6438152b2cac2d0a0764 /Build/source | |
parent | 11e693ea9429803692ac37826ee183c068ffa67e (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')
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 28 | ||||
-rw-r--r-- | Build/source/texk/web2c/pdftexdir/regex/regex_internal.h | 3 |
2 files changed, 26 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 1ecf35dc352..07fab84b503 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,10 @@ +2017-02-16 Karl Berry <karl@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. + (pdftex r765) + 2016-11-05 Karl Berry <karl@tug.org> * pdftoepdf.cc: doc fix. @@ -17,6 +24,17 @@ plus check that rm_eo >= rm_so. Original bug report from David Carlisle, http://tug.org/pipermail/tex-live/2016-June/038664.html + (pdftex r759) + +2016-06-12 Karl Berry <karl@freefriends.org> + and Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * utils.c (last_match_succeeded): new static boolean. + (matchstrings): set it. + (getmatch): use it, plus check for non-NULL match_string sooner, + plus check that rm_eo >= rm_so. + Original bug report from David Carlisle, + http://tug.org/pipermail/tex-live/2016-June/038664.html 2016-05-20 Karl Berry <karl@tug.org> @@ -336,7 +354,7 @@ 2012-08-08 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * ptexlib.h: extern void writestreamlength(longinteger, longinteger); - for largefile. + for largefile. extern void storepacket(internalfontnumber, integer, strnumber); to avoid a compiler warning. * utils.c: void writestreamlength(longinteger length, longinteger offset) @@ -421,7 +439,7 @@ (escape_eol): new fn, replacing print_str, now returning a string. * writettf.c (ttf_reindex_glyphs): use %n to sscanf forms - uniABCD and index123. + uniABCD and index123. * mapfile.c (suppress_warn): way to avoid dup warnings. @@ -594,7 +612,7 @@ * pdftexextra.c (new): #include <pdftexd.h> and <lib/texmfmp.c>. * am/pdftex.am: pdftexextra.[ch] are now distributed; - create {e,pdf}tex_version.h instead of {e,pdf}tex.version. + create {e,pdf}tex_version.h instead of {e,pdf}tex.version. 2010-12-01 Peter Breitenlohner <peb@mppmu.mpg.de> @@ -803,7 +821,7 @@ * writet1.c (append_cs_return): Drop unused local variable 'k'. - * avlstuff.c (destroy_oentry, PdfObjTree_free), + * avlstuff.c (destroy_oentry, PdfObjTree_free), writet1.c (free_glyph_names): Skip unused static functions (via #if 0 ... #endif). @@ -916,7 +934,7 @@ 2009-06-25 Peter Breitenlohner <peb@mppmu.mpg.de> - * epdf.h, ttf2afm.c, writet1.c: + * epdf.h, ttf2afm.c, writet1.c: removed #include <kpathsea/c-proto.h>. * avlstuff.c, epdf.c: removed #include <kpathsea/c-proto.h> and #include <stdarg.h>. 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 |