w32: Avoid conflict with Mingw-w64 version 4.0.4-1

* src/w32-util.c (mkstemp): Rename to my_mkstemp.  Change caller.
--

For some reason the linker seems to use the mkstemp now provided by
mingw instead of our static symbol.  Strange.

Reported-by: Andrej Kacian <andrej@kacian.sk>
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-12-09 11:39:26 +01:00
parent 67d7f7a938
commit 83415dffae
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B

View File

@ -647,7 +647,7 @@ static const char letters[] =
does not exist at the time of the call to mkstemp. TMPL is does not exist at the time of the call to mkstemp. TMPL is
overwritten with the result. */ overwritten with the result. */
static int static int
mkstemp (char *tmpl) my_mkstemp (char *tmpl)
{ {
int len; int len;
char *XXXXXX; char *XXXXXX;
@ -755,7 +755,7 @@ _gpgme_mkstemp (int *fd, char **name)
if (!tmpname) if (!tmpname)
return -1; return -1;
strcpy (stpcpy (tmpname, tmp), "\\gpgme-XXXXXX"); strcpy (stpcpy (tmpname, tmp), "\\gpgme-XXXXXX");
*fd = mkstemp (tmpname); *fd = my_mkstemp (tmpname);
if (fd < 0) if (fd < 0)
{ {
free (tmpname); free (tmpname);