[Pkg-gnupg-commit] [gpgme] 27/412: w32: Avoid conflict with Mingw-w64 version 4.0.4-1

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

commit 83415dffaea53611dbce77b50d8ddfb2a50aed2e
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Dec 9 11:39:26 2015 +0100

    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 at kacian.sk>
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 src/w32-util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/w32-util.c b/src/w32-util.c
index 3600b28..a27955b 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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git