[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 156/205: tool: fix Windows Unicode build
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 156/205: tool: fix Windows Unicode build |
Date: |
Thu, 20 Apr 2017 16:21:36 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.
commit d40f4e15e73f906cd06919da84e535f52637c1a1
Author: Marcel Raad <address@hidden>
AuthorDate: Tue Apr 4 23:02:16 2017 +0200
tool: fix Windows Unicode build
... by explicitly calling the ANSI versions of Windows API functions where
required.
---
src/tool_homedir.c | 4 ++--
src/tool_parsecfg.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/tool_homedir.c b/src/tool_homedir.c
index 26b6c535c..483553d59 100644
--- a/src/tool_homedir.c
+++ b/src/tool_homedir.c
@@ -39,14 +39,14 @@ static char *GetEnv(const char *variable, char do_expand)
/* Don't use getenv(); it doesn't find variable added after program was
* started. Don't accept truncated results (i.e. rc >= sizeof(buf1)). */
- rc = GetEnvironmentVariable(variable, buf1, sizeof(buf1));
+ rc = GetEnvironmentVariableA(variable, buf1, sizeof(buf1));
if(rc > 0 && rc < sizeof(buf1)) {
env = buf1;
variable = buf1;
}
if(do_expand && strchr(variable, '%')) {
/* buf2 == variable if not expanded */
- rc = ExpandEnvironmentStrings(variable, buf2, sizeof(buf2));
+ rc = ExpandEnvironmentStringsA(variable, buf2, sizeof(buf2));
if(rc > 0 && rc < sizeof(buf2) &&
!strchr(buf2, '%')) /* no vars still unexpanded */
env = buf2;
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index 7cf11d8a4..14efc5c3a 100644
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@@ -79,7 +79,7 @@ int parseconfig(const char *filename, struct GlobalConfig
*global)
* already declared via inclusions done in setup header file.
* We assume that we are using the ASCII version here.
*/
- int n = GetModuleFileName(0, filebuffer, sizeof(filebuffer));
+ int n = GetModuleFileNameA(0, filebuffer, sizeof(filebuffer));
if(n > 0 && n < (int)sizeof(filebuffer)) {
/* We got a valid filename - get the directory part */
char *lastdirchar = strrchr(filebuffer, '\\');
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 177/205: .github/stale.yml: enable the stale bot, (continued)
- [GNUnet-SVN] [gnurl] 177/205: .github/stale.yml: enable the stale bot, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 96/205: docs: split file lists into Makefile.inc, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 171/205: schannel: fix compiler warnings, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 183/205: poll: prefer <poll.h> over <sys/poll.h>, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 43/205: Makefile.am: Added scripts/updatemanpages.pl to EXTRA_DIST, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 194/205: .gitattributes: force shell scripts to LF, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 68/205: mbedtls: fix typo in variable name, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 198/205: openssl: make SSL_ERROR_to_str more future-proof, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 178/205: libcurl-thread.3: also mention threaded-resolver, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 145/205: docs: added examples for CURLINFO_FILETIME.3 and CURLOPT_FILETIME.3, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 156/205: tool: fix Windows Unicode build,
gnunet <=
- [GNUnet-SVN] [gnurl] 59/205: openssl: add two /* FALLTHROUGH */ to satisfy coverity, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 99/205: mbedtls: add support for CURLOPT_SSL_CTX_FUNCTION, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 203/205: RELEASE-NOTES: curl 7.54.0, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 112/205: spelling fixes, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 93/205: RELEASE-NOTES: synced with 6e0f26c8a8c28df, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 111/205: curl: check for end of input in writeout backslash handling, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 163/205: test1541: ignore the curl_off_t variable type name comparison, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 107/205: openssl: made the error table static const, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 151/205: llist: replace Curl_llist_alloc with Curl_llist_init, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 164/205: INSTALL.cmake: more problems, gnunet, 2017/04/20