Mercurial > hg > octave-nkf > gnulib-hg
diff lib/tempname.c @ 17919:c3b0e9dd56c5
tempname: allow compilation with C++ (trivial)
* lib/tempname.h [C++]: Specify extern "C" linkage.
* lib/tempname.h (try_tempname):
* lib/tempname.c (__try_tempname, __gen_tempname):
Rename 'try' to 'tryfunc'.
| author | Mike Miller <mtmiller@ieee.org> |
|---|---|
| date | Tue, 17 Feb 2015 22:04:51 -0800 |
| parents | c4e49082f4e2 |
| children |
line wrap: on
line diff
--- a/lib/tempname.c +++ b/lib/tempname.c @@ -179,7 +179,7 @@ int __try_tempname (char *tmpl, int suffixlen, void *args, - int (*try) (char *, void *)) + int (*tryfunc) (char *, void *)) { int len; char *XXXXXX; @@ -244,7 +244,7 @@ v /= 62; XXXXXX[5] = letters[v % 62]; - fd = try (tmpl, args); + fd = tryfunc (tmpl, args); if (fd >= 0) { __set_errno (save_errno); @@ -300,25 +300,25 @@ int __gen_tempname (char *tmpl, int suffixlen, int flags, int kind) { - int (*try) (char *, void *); + int (*tryfunc) (char *, void *); switch (kind) { case __GT_FILE: - try = try_file; + tryfunc = try_file; break; case __GT_DIR: - try = try_dir; + tryfunc = try_dir; break; case __GT_NOCREATE: - try = try_nocreate; + tryfunc = try_nocreate; break; default: assert (! "invalid KIND in __gen_tempname"); abort (); } - return __try_tempname (tmpl, suffixlen, &flags, try); + return __try_tempname (tmpl, suffixlen, &flags, tryfunc); }