diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-26 15:46:18 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-26 22:10:38 -0700 |
| commit | f0b437f3ccebf0a3cc9221359464c838da8ebda6 (patch) | |
| tree | 0c12d455641630d465cb82ffd2fd0e5d188d76a4 /gl/lib/tempname.h.diff | |
| parent | 02f678a350f90b4be572486613f186c75d4008ee (diff) | |
| download | coreutils-f0b437f3ccebf0a3cc9221359464c838da8ebda6.tar.xz | |
build: update gnulib submodule to latest
* bootstrap.conf (gnulib_modules): Add file-has-acl.
(buildreq): Bump autopoint and gettext to 0.19.4.
* configure.ac (AM_GNU_GETTEXT_VERSION):
Bump to 0.19.4.
* gl/lib/tempname.c.diff, gl/lib/tempname.h.diff:
Merge recent gnulib changes.
Diffstat (limited to 'gl/lib/tempname.h.diff')
| -rw-r--r-- | gl/lib/tempname.h.diff | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gl/lib/tempname.h.diff b/gl/lib/tempname.h.diff index 843692efd..210e70bd9 100644 --- a/gl/lib/tempname.h.diff +++ b/gl/lib/tempname.h.diff @@ -1,21 +1,23 @@ diff --git a/lib/tempname.h b/lib/tempname.h -index f7c98d0..793207f 100644 +index e609360..6029b9f 100644 --- a/lib/tempname.h +++ b/lib/tempname.h -@@ -46,6 +46,8 @@ +@@ -50,6 +50,8 @@ extern "C" { We use a clever algorithm to get hard-to-predict names. */ extern int gen_tempname (char *tmpl, int suffixlen, int flags, int kind); +extern int gen_tempname_len (char *tmpl, int suffixlen, int flags, int kind, + size_t x_suffix_len); - /* Similar to gen_tempname, but TRY is called for each temporary - name to try. If TRY returns a non-negative number, TRY_GEN_TEMPNAME -@@ -53,5 +55,7 @@ extern int gen_tempname (char *tmpl, int suffixlen, int flags, int kind); + /* Similar to gen_tempname, but TRYFUNC is called for each temporary + name to try. If TRYFUNC returns a non-negative number, TRY_GEN_TEMPNAME +@@ -57,6 +59,9 @@ extern int gen_tempname (char *tmpl, int suffixlen, int flags, int kind); name is tried, or else TRY_GEN_TEMPNAME returns -1. */ extern int try_tempname (char *tmpl, int suffixlen, void *args, - int (*try) (char *, void *)); + int (*tryfunc) (char *, void *)); +extern int try_tempname_len (char *tmpl, int suffixlen, void *args, -+ int (*try) (char *, void *), size_t x_suffix_len); ++ int (*tryfunc) (char *, void *), ++ size_t x_suffix_len); - #endif /* GL_TEMPNAME_H */ + #ifdef __cplusplus + } |