Tue 19 Sep 2017 02:04:03 PM UTC, original submission:
Simple fix (by gisle vanem on lwip-devel):
--- a/src/apps/httpd/makefsdata/makefsdata.c 2017-09-18 19:58:19
+++ b/src/apps/httpd/makefsdata/makefsdata.c 2017-09-18 21:23:35
@@ -421,7 +421,7 @@
ret = tinydir_readfile_n(&dir, &file, i);
if (ret == 0) {
-#if (defined MSC_VER || defined __MINGW32_)
+#if (defined MSC_VER || defined __MINGW32_) && (defined _UNICODE)
size_t i;
char currName[256];
wcstombs_s(&i, currName, sizeof(currName), file.name, sizeof(currName));
@@ -461,12 +461,12 @@
if (ret == 0) {
if (!file.is_dir) {
-#if (defined MSC_VER || defined __MINGW32_)
+#if (defined MSC_VER || defined __MINGW32_) && defined _UNICODE
size_t i;
char curName[256];
wcstombs_s(&i, curName, sizeof(curName), file.name, sizeof(curName));
#else
- const char *currName = file.name;
+ const char *curName = file.name;
#endif
if (strcmp(curName, "fsdata.tmp") == 0) {
Note the code's use of 'currName' and 'curName'.
|