aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-03-31 16:42:58 +0100
committerRon Yorston <rmy@pobox.com>2012-03-31 16:42:58 +0100
commit0ebbd36f808f10b302bef468b71564b8d7b333ec (patch)
tree26d38daf99c7154fdd8f1dd7305fc9a8a0bd4a11
parentf9f2117d5b7057f986850741b85bde5c30590b02 (diff)
downloadbusybox-w32-0ebbd36f808f10b302bef468b71564b8d7b333ec.tar.gz
busybox-w32-0ebbd36f808f10b302bef468b71564b8d7b333ec.tar.bz2
busybox-w32-0ebbd36f808f10b302bef468b71564b8d7b333ec.zip
Fix off_t define so MINGW32 doesn't require LFS
-rw-r--r--Config.in1
-rw-r--r--configs/mingw32_defconfig4
-rw-r--r--include/mingw.h4
3 files changed, 5 insertions, 4 deletions
diff --git a/Config.in b/Config.in
index 1ed1bc0d4..cd51e2b45 100644
--- a/Config.in
+++ b/Config.in
@@ -20,7 +20,6 @@ config PLATFORM_POSIX
20 20
21config PLATFORM_MINGW32 21config PLATFORM_MINGW32
22 bool "MS Windows (MinGW port)" 22 bool "MS Windows (MinGW port)"
23 select LFS
24 23
25endchoice 24endchoice
26 25
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index cabb0b4f0..7e19586e5 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.20.0.git 3# Busybox version: 1.20.0.git
4# Tue Mar 27 11:53:57 2012 4# Sat Mar 31 15:38:08 2012
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
@@ -63,7 +63,7 @@ CONFIG_BUSYBOX_EXEC_PATH=""
63# CONFIG_BUILD_LIBBUSYBOX is not set 63# CONFIG_BUILD_LIBBUSYBOX is not set
64# CONFIG_FEATURE_INDIVIDUAL is not set 64# CONFIG_FEATURE_INDIVIDUAL is not set
65# CONFIG_FEATURE_SHARED_BUSYBOX is not set 65# CONFIG_FEATURE_SHARED_BUSYBOX is not set
66CONFIG_LFS=y 66# CONFIG_LFS is not set
67CONFIG_CROSS_COMPILER_PREFIX="i686-pc-mingw32-" 67CONFIG_CROSS_COMPILER_PREFIX="i686-pc-mingw32-"
68CONFIG_SYSROOT="" 68CONFIG_SYSROOT=""
69CONFIG_EXTRA_CFLAGS="-g -O0" 69CONFIG_EXTRA_CFLAGS="-g -O0"
diff --git a/include/mingw.h b/include/mingw.h
index fd0b09b15..c99612b9c 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -239,7 +239,9 @@ int mingw_mkdir(const char *path, int mode);
239/* Use mingw_lstat()/mingw_stat() instead of lstat()/stat() and 239/* Use mingw_lstat()/mingw_stat() instead of lstat()/stat() and
240 * mingw_fstat() instead of fstat() on Windows. 240 * mingw_fstat() instead of fstat() on Windows.
241 */ 241 */
242#define off_t off64_t 242#if ENABLE_LFS
243# define off_t off64_t
244#endif
243#define lseek _lseeki64 245#define lseek _lseeki64
244#define stat _stati64 246#define stat _stati64
245int mingw_lstat(const char *file_name, struct stat *buf); 247int mingw_lstat(const char *file_name, struct stat *buf);