aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-12-09 10:39:26 +0000
committerWerner Koch <[email protected]>2015-12-09 10:39:26 +0000
commit83415dffaea53611dbce77b50d8ddfb2a50aed2e (patch)
tree1356e30087b94fbf46ba84d0bb0e957093d8f1a5
parentReturn on user cancellation of delete operation (diff)
downloadgpgme-83415dffaea53611dbce77b50d8ddfb2a50aed2e.tar.gz
gpgme-83415dffaea53611dbce77b50d8ddfb2a50aed2e.zip
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 <[email protected]> Signed-off-by: Werner Koch <[email protected]>
-rw-r--r--src/w32-util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/w32-util.c b/src/w32-util.c
index 3600b28a..a27955b5 100644
--- a/src/w32-util.c
+++ b/src/w32-util.c
@@ -647,7 +647,7 @@ static const char letters[] =
does not exist at the time of the call to mkstemp. TMPL is
overwritten with the result. */
static int
-mkstemp (char *tmpl)
+my_mkstemp (char *tmpl)
{
int len;
char *XXXXXX;
@@ -755,7 +755,7 @@ _gpgme_mkstemp (int *fd, char **name)
if (!tmpname)
return -1;
strcpy (stpcpy (tmpname, tmp), "\\gpgme-XXXXXX");
- *fd = mkstemp (tmpname);
+ *fd = my_mkstemp (tmpname);
if (fd < 0)
{
free (tmpname);