From 0ebbd36f808f10b302bef468b71564b8d7b333ec Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Sat, 31 Mar 2012 16:42:58 +0100 Subject: Fix off_t define so MINGW32 doesn't require LFS --- Config.in | 1 - configs/mingw32_defconfig | 4 ++-- include/mingw.h | 4 +++- 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 config PLATFORM_MINGW32 bool "MS Windows (MinGW port)" - select LFS endchoice 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 @@ # # Automatically generated make config: don't edit # Busybox version: 1.20.0.git -# Tue Mar 27 11:53:57 2012 +# Sat Mar 31 15:38:08 2012 # CONFIG_HAVE_DOT_CONFIG=y # CONFIG_PLATFORM_POSIX is not set @@ -63,7 +63,7 @@ CONFIG_BUSYBOX_EXEC_PATH="" # CONFIG_BUILD_LIBBUSYBOX is not set # CONFIG_FEATURE_INDIVIDUAL is not set # CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y +# CONFIG_LFS is not set CONFIG_CROSS_COMPILER_PREFIX="i686-pc-mingw32-" CONFIG_SYSROOT="" CONFIG_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); /* Use mingw_lstat()/mingw_stat() instead of lstat()/stat() and * mingw_fstat() instead of fstat() on Windows. */ -#define off_t off64_t +#if ENABLE_LFS +# define off_t off64_t +#endif #define lseek _lseeki64 #define stat _stati64 int mingw_lstat(const char *file_name, struct stat *buf); -- cgit v1.2.3-55-g6feb