summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Takata <kentkt@csc.jp>2024-07-04 19:35:48 +0200
committerChristian Brabandt <cb@256bit.org>2024-07-04 19:35:48 +0200
commit470c0db2b3a592a7fe47b17818d4d50ed79360b3 (patch)
tree9196cd6524a05a558a3a6fb0495729974ed3c0bb
parent749ba0f6d922b3f6b54a66543c214479492b5a0e (diff)
patch 9.1.0530: xxd: MSVC warning about non-ASCII characterv9.1.0530
Problem: xxd: MSVC warning about non-ASCII character Solution: Specify source-charset:utf-8 in Makefile (Ken Takata) xxd.c has non-ASCII-character comments. This causes the following warning on MSVC: ``` warning C4819: The file contains a character that cannot be represented in the current code page (932). Save the file in Unicode format to prevent data loss. ``` Add the `/source-charset:utf-8` option to avoid this. closes: #15119 Signed-off-by: Ken Takata <kentkt@csc.jp> Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r--src/version.c2
-rw-r--r--src/xxd/Make_mvc.mak2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index b7812fa009..159fe3b814 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 530,
+/**/
529,
/**/
528,
diff --git a/src/xxd/Make_mvc.mak b/src/xxd/Make_mvc.mak
index 0133d73115..2361ab3d54 100644
--- a/src/xxd/Make_mvc.mak
+++ b/src/xxd/Make_mvc.mak
@@ -9,7 +9,7 @@ SUBSYSTEM = $(SUBSYSTEM),$(SUBSYSTEM_VER)
xxd: xxd.exe
xxd.exe: xxd.c
- cl /nologo -DWIN32 xxd.c -link -subsystem:$(SUBSYSTEM)
+ cl /nologo /source-charset:utf-8 -DWIN32 xxd.c -link -subsystem:$(SUBSYSTEM)
# This was for an older compiler
# cl /nologo -DWIN32 xxd.c /link setargv.obj