summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-01-19 23:10:59 +0800
committerruki <[email protected]>2023-01-19 23:10:59 +0800
commit17978855ebb374e21593129b52d3266db7715eb5 (patch)
tree53007c261308d814fe0e71cb59a4fb3a5899ce4c
parentee77e47e83627f067653515c711398f76f13cee8 (diff)
improve syserror
-rwxr-xr-xcore/src/tbox/inc/bsd/tbox.config.h8
-rwxr-xr-xcore/src/tbox/inc/cygwin/tbox.config.h8
-rwxr-xr-xcore/src/tbox/inc/iphoneos/tbox.config.h8
-rwxr-xr-xcore/src/tbox/inc/linux/tbox.config.h6
-rwxr-xr-xcore/src/tbox/inc/macosx/tbox.config.h6
-rwxr-xr-xcore/src/tbox/inc/mingw/tbox.config.h8
-rwxr-xr-xcore/src/tbox/inc/msys/tbox.config.h8
-rw-r--r--core/src/xmake/os/strerror.c2
-rw-r--r--core/src/xmake/os/syserror.c2
9 files changed, 30 insertions, 26 deletions
diff --git a/core/src/tbox/inc/bsd/tbox.config.h b/core/src/tbox/inc/bsd/tbox.config.h
index 7101e4d67..6076d4063 100755
--- a/core/src/tbox/inc/bsd/tbox.config.h
+++ b/core/src/tbox/inc/bsd/tbox.config.h
@@ -2,11 +2,11 @@
#define TB_CONFIG_H
// version
-#define TB_CONFIG_VERSION "1.6.5"
+#define TB_CONFIG_VERSION "1.7.3"
#define TB_CONFIG_VERSION_MAJOR 1
-#define TB_CONFIG_VERSION_MINOR 6
-#define TB_CONFIG_VERSION_ALTER 5
-#define TB_CONFIG_VERSION_BUILD 202005081838
+#define TB_CONFIG_VERSION_MINOR 7
+#define TB_CONFIG_VERSION_ALTER 3
+#define TB_CONFIG_VERSION_BUILD 20230119
// defines
#define TB_CONFIG_OS_BSD 1
diff --git a/core/src/tbox/inc/cygwin/tbox.config.h b/core/src/tbox/inc/cygwin/tbox.config.h
index 035d786f3..c20d7a228 100755
--- a/core/src/tbox/inc/cygwin/tbox.config.h
+++ b/core/src/tbox/inc/cygwin/tbox.config.h
@@ -2,11 +2,11 @@
#define TB_CONFIG_H
// version
-#define TB_CONFIG_VERSION "1.6.4"
+#define TB_CONFIG_VERSION "1.7.3"
#define TB_CONFIG_VERSION_MAJOR 1
-#define TB_CONFIG_VERSION_MINOR 6
-#define TB_CONFIG_VERSION_ALTER 4
-#define TB_CONFIG_VERSION_BUILD 202002101417
+#define TB_CONFIG_VERSION_MINOR 7
+#define TB_CONFIG_VERSION_ALTER 3
+#define TB_CONFIG_VERSION_BUILD 20230119
// defines
#define TB_CONFIG_OS_WINDOWS 1
diff --git a/core/src/tbox/inc/iphoneos/tbox.config.h b/core/src/tbox/inc/iphoneos/tbox.config.h
index 8bb9ad3aa..25fa73deb 100755
--- a/core/src/tbox/inc/iphoneos/tbox.config.h
+++ b/core/src/tbox/inc/iphoneos/tbox.config.h
@@ -2,11 +2,11 @@
#define TB_CONFIG_H
// version
-#define TB_CONFIG_VERSION "1.6.6"
+#define TB_CONFIG_VERSION "1.7.3"
#define TB_CONFIG_VERSION_MAJOR 1
-#define TB_CONFIG_VERSION_MINOR 6
-#define TB_CONFIG_VERSION_ALTER 6
-#define TB_CONFIG_VERSION_BUILD 202103241707
+#define TB_CONFIG_VERSION_MINOR 7
+#define TB_CONFIG_VERSION_ALTER 3
+#define TB_CONFIG_VERSION_BUILD 20230119
// defines
#define TB_CONFIG_OS_IOS 1
diff --git a/core/src/tbox/inc/linux/tbox.config.h b/core/src/tbox/inc/linux/tbox.config.h
index a1986b4be..2b36347a7 100755
--- a/core/src/tbox/inc/linux/tbox.config.h
+++ b/core/src/tbox/inc/linux/tbox.config.h
@@ -2,11 +2,11 @@
#define TB_CONFIG_H
// version
-#define TB_CONFIG_VERSION "1.6.3"
+#define TB_CONFIG_VERSION "1.7.3"
#define TB_CONFIG_VERSION_MAJOR 1
-#define TB_CONFIG_VERSION_MINOR 6
+#define TB_CONFIG_VERSION_MINOR 7
#define TB_CONFIG_VERSION_ALTER 3
-#define TB_CONFIG_VERSION_BUILD 201907051345
+#define TB_CONFIG_VERSION_BUILD 20230119
// defines
#define TB_CONFIG_OS_LINUX 1
diff --git a/core/src/tbox/inc/macosx/tbox.config.h b/core/src/tbox/inc/macosx/tbox.config.h
index 59abf4acf..203f42b89 100755
--- a/core/src/tbox/inc/macosx/tbox.config.h
+++ b/core/src/tbox/inc/macosx/tbox.config.h
@@ -2,11 +2,11 @@
#define TB_CONFIG_H
// version
-#define TB_CONFIG_VERSION "1.6.3"
+#define TB_CONFIG_VERSION "1.7.3"
#define TB_CONFIG_VERSION_MAJOR 1
-#define TB_CONFIG_VERSION_MINOR 6
+#define TB_CONFIG_VERSION_MINOR 7
#define TB_CONFIG_VERSION_ALTER 3
-#define TB_CONFIG_VERSION_BUILD 201907052137
+#define TB_CONFIG_VERSION_BUILD 20230119
// defines
#define TB_CONFIG_OS_MACOSX 1
diff --git a/core/src/tbox/inc/mingw/tbox.config.h b/core/src/tbox/inc/mingw/tbox.config.h
index 035d786f3..c20d7a228 100755
--- a/core/src/tbox/inc/mingw/tbox.config.h
+++ b/core/src/tbox/inc/mingw/tbox.config.h
@@ -2,11 +2,11 @@
#define TB_CONFIG_H
// version
-#define TB_CONFIG_VERSION "1.6.4"
+#define TB_CONFIG_VERSION "1.7.3"
#define TB_CONFIG_VERSION_MAJOR 1
-#define TB_CONFIG_VERSION_MINOR 6
-#define TB_CONFIG_VERSION_ALTER 4
-#define TB_CONFIG_VERSION_BUILD 202002101417
+#define TB_CONFIG_VERSION_MINOR 7
+#define TB_CONFIG_VERSION_ALTER 3
+#define TB_CONFIG_VERSION_BUILD 20230119
// defines
#define TB_CONFIG_OS_WINDOWS 1
diff --git a/core/src/tbox/inc/msys/tbox.config.h b/core/src/tbox/inc/msys/tbox.config.h
index 035d786f3..c20d7a228 100755
--- a/core/src/tbox/inc/msys/tbox.config.h
+++ b/core/src/tbox/inc/msys/tbox.config.h
@@ -2,11 +2,11 @@
#define TB_CONFIG_H
// version
-#define TB_CONFIG_VERSION "1.6.4"
+#define TB_CONFIG_VERSION "1.7.3"
#define TB_CONFIG_VERSION_MAJOR 1
-#define TB_CONFIG_VERSION_MINOR 6
-#define TB_CONFIG_VERSION_ALTER 4
-#define TB_CONFIG_VERSION_BUILD 202002101417
+#define TB_CONFIG_VERSION_MINOR 7
+#define TB_CONFIG_VERSION_ALTER 3
+#define TB_CONFIG_VERSION_BUILD 20230119
// defines
#define TB_CONFIG_OS_WINDOWS 1
diff --git a/core/src/xmake/os/strerror.c b/core/src/xmake/os/strerror.c
index 09663daff..7f0b5e3bb 100644
--- a/core/src/xmake/os/strerror.c
+++ b/core/src/xmake/os/strerror.c
@@ -52,9 +52,11 @@ tb_int_t xm_os_strerror(lua_State* lua)
case TB_STATE_SYSERROR_NOT_PERM:
strerr = "Permission denied";
break;
+#if ((TB_VERSION_MAJOR * 100) + (TB_VERSION_MINOR * 10) + TB_VERSION_ALTER) >= 173
case TB_STATE_SYSERROR_NOT_ACCESS:
strerr = "Not access because it is busy";
break;
+#endif
case TB_STATE_SYSERROR_NOT_FILEDIR:
strerr = "No such file or directory";
break;
diff --git a/core/src/xmake/os/syserror.c b/core/src/xmake/os/syserror.c
index 1ab6afb23..0aded427f 100644
--- a/core/src/xmake/os/syserror.c
+++ b/core/src/xmake/os/syserror.c
@@ -45,7 +45,9 @@ tb_int_t xm_os_syserror(lua_State* lua)
{
case TB_STATE_SYSERROR_NOT_PERM: err = 1; break;
case TB_STATE_SYSERROR_NOT_FILEDIR: err = 2; break;
+#if ((TB_VERSION_MAJOR * 100) + (TB_VERSION_MINOR * 10) + TB_VERSION_ALTER) >= 173
case TB_STATE_SYSERROR_NOT_ACCESS: err = 3; break;
+#endif
case TB_STATE_SYSERROR_UNKNOWN_ERROR: err = -1; break;
}
lua_pushinteger(lua, err);