summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorruki <[email protected]>2019-07-10 00:31:43 +0800
committerruki <[email protected]>2019-07-09 21:10:23 +0800
commit568844957830f65aab43c2d309afff64772655c7 (patch)
tree1902a3b278bf66cc3c8c77a04885492d02eaf2a0 /core/src
parente1ce90c0f55538dd6e548ef5a5cee22fd8472d23 (diff)
update tbox to support ansi
Diffstat (limited to 'core/src')
-rw-r--r--core/src/tbox/makefile1
m---------core/src/tbox/tbox0
-rw-r--r--core/src/xmake/io/open.c4
3 files changed, 5 insertions, 0 deletions
diff --git a/core/src/tbox/makefile b/core/src/tbox/makefile
index 9a98eaa9c..51dc1ae1c 100644
--- a/core/src/tbox/makefile
+++ b/core/src/tbox/makefile
@@ -234,6 +234,7 @@ tbox_C_FILES += \
tbox/src/tbox/platform/thread_local \
tbox/src/tbox/platform/time \
tbox/src/tbox/platform/timer \
+ tbox/src/tbox/platform/impl/charset \
tbox/src/tbox/platform/impl/sockdata \
tbox/src/tbox/platform/impl/dns \
tbox/src/tbox/platform/impl/platform \
diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox
-Subproject 947266080296e74b99862134455ba562e6e5323
+Subproject 5ee4918ff9cdafc9200b1a15d2e360959c3b344
diff --git a/core/src/xmake/io/open.c b/core/src/xmake/io/open.c
index d2eda4fe3..436617e00 100644
--- a/core/src/xmake/io/open.c
+++ b/core/src/xmake/io/open.c
@@ -135,6 +135,10 @@ static tb_size_t xm_io_file_detect_charset(tb_byte_t const** data_ptr, tb_long_t
break;
}
+#ifdef TB_CONFIG_OS_WINDOWS
+ charset = TB_CHARSET_TYPE_ANSI;
+#endif
+
} while (0);
*data_ptr = data;