summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek.chauhan@gmail.com>2019-11-15 14:10:49 +0000
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2019-11-15 14:10:49 +0000
commit4188c7574d25e4be2d30789b1465708813dbe6fb (patch)
treef03955095a6db575974bfc9845bf495454b95327
parent344b724f77f60fe34c5ef7e4ae80730beef74c29 (diff)
parent90a659a22280e8a2dcf4a9330dfbaa182cb6f256 (diff)
downloadjson-glib-4188c7574d25e4be2d30789b1465708813dbe6fb.tar.gz
Merge branch 'msvc-fix' into 'master'
meson: Don't error with MSVC C4819 warning See merge request GNOME/json-glib!17
-rw-r--r--meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 69c3896..f84d865 100644
--- a/meson.build
+++ b/meson.build
@@ -74,7 +74,7 @@ if cc.get_id() == 'msvc'
'-we4049', # terminating line number emission
'-we4053', # an expression of type void was used as an operand
'-we4071', # no function prototype given
- '-we4819', # the file contains a character that cannot be represented in the current code page
+ '/utf-8', # Set the input and exec encoding to utf-8
]
elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
test_cflags = [