diff options
author | Ron Yorston <rmy@pobox.com> | 2014-11-29 17:11:36 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2014-11-29 17:29:17 +0000 |
commit | d85147d303301b63dfe34bcd9c74b4421871633a (patch) | |
tree | 2e4a9360a85230d7dbfdb32e62b830d890ae83b7 | |
parent | fa147bd7ecb086f4fb9a4afea16b946693a822ce (diff) | |
download | busybox-w32-d85147d303301b63dfe34bcd9c74b4421871633a.tar.gz busybox-w32-d85147d303301b63dfe34bcd9c74b4421871633a.tar.bz2 busybox-w32-d85147d303301b63dfe34bcd9c74b4421871633a.zip |
Move definition of bb_got_signal to mingw.c
On POSIX platforms bb_got_signal is defined in libbb/signals.c; for
MinGW put the definition in win32/mingw.c. This is better than the
-rw-r--r-- | archival/tar.c | 4 | ||||
-rw-r--r-- | win32/mingw.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/archival/tar.c b/archival/tar.c index f2e4bedbe..63d844a3a 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
@@ -966,10 +966,6 @@ static const char tar_longopts[] ALIGN1 = | |||
966 | ; | 966 | ; |
967 | #endif | 967 | #endif |
968 | 968 | ||
969 | #if ENABLE_PLATFORM_MINGW32 | ||
970 | smallint bb_got_signal; | ||
971 | #endif | ||
972 | |||
973 | int tar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 969 | int tar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
974 | int tar_main(int argc UNUSED_PARAM, char **argv) | 970 | int tar_main(int argc UNUSED_PARAM, char **argv) |
975 | { | 971 | { |
diff --git a/win32/mingw.c b/win32/mingw.c index dfdbecc85..eeafd7d75 100644 --- a/win32/mingw.c +++ b/win32/mingw.c | |||
@@ -8,6 +8,8 @@ int _CRT_glob = 0; | |||
8 | 8 | ||
9 | unsigned int _CRT_fmode = _O_BINARY; | 9 | unsigned int _CRT_fmode = _O_BINARY; |
10 | 10 | ||
11 | smallint bb_got_signal; | ||
12 | |||
11 | static int err_win_to_posix(DWORD winerr) | 13 | static int err_win_to_posix(DWORD winerr) |
12 | { | 14 | { |
13 | int error = ENOSYS; | 15 | int error = ENOSYS; |