summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2019-03-31 09:54:17 +0100
committerRon Yorston <rmy@pobox.com>2019-03-31 09:54:17 +0100
commitf6228015354adbdbbc736b33296112bebbc96cf3 (patch)
tree83593f82bdf88e1cedc1c3993e1c7ae91b817922
parent61e0e3160a8be3ed8488b09200a5dca1bd1b21b4 (diff)
downloadbusybox-w32-f6228015354adbdbbc736b33296112bebbc96cf3.tar.gz
busybox-w32-f6228015354adbdbbc736b33296112bebbc96cf3.tar.bz2
busybox-w32-f6228015354adbdbbc736b33296112bebbc96cf3.zip
win32: fix compilation error; update default configurations
-rw-r--r--configs/mingw32_defconfig3
-rw-r--r--configs/mingw64_defconfig3
-rw-r--r--include/mingw.h1
3 files changed, 5 insertions, 2 deletions
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index a51805b84..656a0ab7c 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.31.0.git 3# Busybox version: 1.31.0.git
4# Wed Mar 20 11:37:19 2019 4# Sun Mar 31 09:45:46 2019
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7# CONFIG_PLATFORM_POSIX is not set 7# CONFIG_PLATFORM_POSIX is not set
@@ -824,6 +824,7 @@ CONFIG_MAN=y
824# CONFIG_SETSERIAL is not set 824# CONFIG_SETSERIAL is not set
825CONFIG_STRINGS=y 825CONFIG_STRINGS=y
826# CONFIG_TIME is not set 826# CONFIG_TIME is not set
827CONFIG_TS=y
827CONFIG_TTYSIZE=y 828CONFIG_TTYSIZE=y
828# CONFIG_UBIRENAME is not set 829# CONFIG_UBIRENAME is not set
829# CONFIG_UBIATTACH is not set 830# CONFIG_UBIATTACH is not set
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index b773fb1b1..8db906466 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.31.0.git 3# Busybox version: 1.31.0.git
4# Wed Mar 20 11:37:19 2019 4# Sun Mar 31 09:45:46 2019
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7# CONFIG_PLATFORM_POSIX is not set 7# CONFIG_PLATFORM_POSIX is not set
@@ -824,6 +824,7 @@ CONFIG_MAN=y
824# CONFIG_SETSERIAL is not set 824# CONFIG_SETSERIAL is not set
825CONFIG_STRINGS=y 825CONFIG_STRINGS=y
826# CONFIG_TIME is not set 826# CONFIG_TIME is not set
827CONFIG_TS=y
827CONFIG_TTYSIZE=y 828CONFIG_TTYSIZE=y
828# CONFIG_UBIRENAME is not set 829# CONFIG_UBIRENAME is not set
829# CONFIG_UBIATTACH is not set 830# CONFIG_UBIATTACH is not set
diff --git a/include/mingw.h b/include/mingw.h
index 8b295814c..1ec5292d8 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -181,6 +181,7 @@ int winansi_getc(FILE *stream);
181#define WEXITSTATUS(x) (((x) & 0xff00) >> 8) 181#define WEXITSTATUS(x) (((x) & 0xff00) >> 8)
182#define WIFSIGNALED(x) (((signed char) (((x) & 0x7f) + 1) >> 1) > 0) 182#define WIFSIGNALED(x) (((signed char) (((x) & 0x7f) + 1) >> 1) > 0)
183#define WCOREDUMP(x) 0 183#define WCOREDUMP(x) 0
184#define WIFSTOPPED(x) 0
184 185
185int mingw_system(const char *cmd); 186int mingw_system(const char *cmd);
186#define system mingw_system 187#define system mingw_system