summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorruki <[email protected]>2019-07-24 23:05:25 +0800
committerruki <[email protected]>2019-07-24 12:32:35 +0800
commit7a6febd132b8a00f7548eba2c41b464b8086033a (patch)
tree5e9552f1602eea65fe0b1de05cc6af5de7748863 /core/src
parent81446e4035282a53c54b54030b1453b3c2a88582 (diff)
update tbox to support filelock
Diffstat (limited to 'core/src')
-rwxr-xr-xcore/src/tbox/inc/linux/tbox.config.h4
-rwxr-xr-xcore/src/tbox/inc/macosx/tbox.config.h4
-rw-r--r--core/src/tbox/makefile1
m---------core/src/tbox/tbox0
4 files changed, 9 insertions, 0 deletions
diff --git a/core/src/tbox/inc/linux/tbox.config.h b/core/src/tbox/inc/linux/tbox.config.h
index 1b2590f12..47a6e5d31 100755
--- a/core/src/tbox/inc/linux/tbox.config.h
+++ b/core/src/tbox/inc/linux/tbox.config.h
@@ -176,6 +176,10 @@
#define TB_CONFIG_POSIX_HAVE_GETNAMEINFO 1
#define TB_CONFIG_POSIX_HAVE_GETHOSTBYNAME 1
#define TB_CONFIG_POSIX_HAVE_GETHOSTBYADDR 1
+#define TB_CONFIG_POSIX_HAVE_FCNTL 1
+
+// freebsd functions
+#define TB_CONFIG_FREEBSD_HAVE_FLOCK 1
// systemv functions
#define TB_CONFIG_SYSTEMV_HAVE_SEMGET 1
diff --git a/core/src/tbox/inc/macosx/tbox.config.h b/core/src/tbox/inc/macosx/tbox.config.h
index 5bfbea9cc..12f545d27 100755
--- a/core/src/tbox/inc/macosx/tbox.config.h
+++ b/core/src/tbox/inc/macosx/tbox.config.h
@@ -176,6 +176,10 @@
#define TB_CONFIG_POSIX_HAVE_GETNAMEINFO 1
#define TB_CONFIG_POSIX_HAVE_GETHOSTBYNAME 1
#define TB_CONFIG_POSIX_HAVE_GETHOSTBYADDR 1
+#define TB_CONFIG_POSIX_HAVE_FCNTL 1
+
+// freebsd functions
+#define TB_CONFIG_FREEBSD_HAVE_FLOCK 1
// systemv functions
#define TB_CONFIG_SYSTEMV_HAVE_SEMGET 1
diff --git a/core/src/tbox/makefile b/core/src/tbox/makefile
index 51dc1ae1c..b4b00b592 100644
--- a/core/src/tbox/makefile
+++ b/core/src/tbox/makefile
@@ -214,6 +214,7 @@ tbox_C_FILES += \
tbox/src/tbox/platform/environment \
tbox/src/tbox/platform/event \
tbox/src/tbox/platform/file \
+ tbox/src/tbox/platform/filelock \
tbox/src/tbox/platform/hostname \
tbox/src/tbox/platform/ifaddrs \
tbox/src/tbox/platform/ltimer \
diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox
-Subproject 1157197acc1e7cf7eff162db47ea6c76c152abf
+Subproject 64935adf0b9044d7029cd7030c0d272f9777e58