diff options
author | Yabin Cui <yabinc@google.com> | 2014-11-10 10:37:14 -0800 |
---|---|---|
committer | Yabin Cui <yabinc@google.com> | 2014-11-10 15:27:49 -0800 |
commit | 4120e835fb43ee059e83e3f34833bf15a7d6d7a3 (patch) | |
tree | 20afe300d0538248a7fbdf4c3e63b7c0f37f159e | |
parent | 652ff716b819b694be76e63f059dca50e7febb8d (diff) | |
download | build-4120e835fb43ee059e83e3f34833bf15a7d6d7a3.zip build-4120e835fb43ee059e83e3f34833bf15a7d6d7a3.tar.gz build-4120e835fb43ee059e83e3f34833bf15a7d6d7a3.tar.bz2 |
kill HAVE_STAT_ST_MTIM
Bug: 18300671
Change-Id: I92b5691924b995d9c883fc0f777c566ac4c35d1d
-rw-r--r-- | core/combo/include/arch/darwin-x86/AndroidConfig.h | 5 | ||||
-rw-r--r-- | core/combo/include/arch/linux-arm/AndroidConfig.h | 5 | ||||
-rw-r--r-- | core/combo/include/arch/linux-arm64/AndroidConfig.h | 5 | ||||
-rw-r--r-- | core/combo/include/arch/linux-mips/AndroidConfig.h | 5 | ||||
-rw-r--r-- | core/combo/include/arch/linux-mips64/AndroidConfig.h | 5 | ||||
-rw-r--r-- | core/combo/include/arch/linux-x86/AndroidConfig.h | 5 | ||||
-rw-r--r-- | core/combo/include/arch/target_linux-x86/AndroidConfig.h | 5 | ||||
-rw-r--r-- | libs/host/CopyFile.c | 8 |
8 files changed, 3 insertions, 40 deletions
diff --git a/core/combo/include/arch/darwin-x86/AndroidConfig.h b/core/combo/include/arch/darwin-x86/AndroidConfig.h index 9546f7a..96d3936 100644 --- a/core/combo/include/arch/darwin-x86/AndroidConfig.h +++ b/core/combo/include/arch/darwin-x86/AndroidConfig.h @@ -191,11 +191,6 @@ #define HAVE_PREAD 1 /* - * Define if we have st_mtim in struct stat - */ -#define HAVE_STAT_ST_MTIM 1 - -/* * Define if printf() supports %zd for size_t arguments */ #define HAVE_PRINTF_ZD 1 diff --git a/core/combo/include/arch/linux-arm/AndroidConfig.h b/core/combo/include/arch/linux-arm/AndroidConfig.h index ce2bbd4..5227bbf 100644 --- a/core/combo/include/arch/linux-arm/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm/AndroidConfig.h @@ -201,11 +201,6 @@ #define HAVE_PREAD 1 /* - * Define if we have st_mtim in struct stat - */ -#define HAVE_STAT_ST_MTIM 1 - -/* * Define if printf() supports %zd for size_t arguments */ #define HAVE_PRINTF_ZD 1 diff --git a/core/combo/include/arch/linux-arm64/AndroidConfig.h b/core/combo/include/arch/linux-arm64/AndroidConfig.h index e5c225c..961a6c2 100644 --- a/core/combo/include/arch/linux-arm64/AndroidConfig.h +++ b/core/combo/include/arch/linux-arm64/AndroidConfig.h @@ -199,11 +199,6 @@ #define HAVE_PREAD 1 /* - * Define if we have st_mtim in struct stat - */ -#define HAVE_STAT_ST_MTIM 1 - -/* * Define if printf() supports %zd for size_t arguments */ #define HAVE_PRINTF_ZD 1 diff --git a/core/combo/include/arch/linux-mips/AndroidConfig.h b/core/combo/include/arch/linux-mips/AndroidConfig.h index 3d8f8e8..48e1613 100644 --- a/core/combo/include/arch/linux-mips/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips/AndroidConfig.h @@ -252,11 +252,6 @@ #define HAVE_PREAD 1 /* - * Define if we have st_mtim in struct stat - */ -#define HAVE_STAT_ST_MTIM 1 - -/* * Define if printf() supports %zd for size_t arguments */ #define HAVE_PRINTF_ZD 1 diff --git a/core/combo/include/arch/linux-mips64/AndroidConfig.h b/core/combo/include/arch/linux-mips64/AndroidConfig.h index 6a465a5..0ea45c4 100644 --- a/core/combo/include/arch/linux-mips64/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips64/AndroidConfig.h @@ -242,11 +242,6 @@ #define HAVE_PREAD 1 /* - * Define if we have st_mtim in struct stat - */ -#define HAVE_STAT_ST_MTIM 1 - -/* * Define if printf() supports %zd for size_t arguments */ #define HAVE_PRINTF_ZD 1 diff --git a/core/combo/include/arch/linux-x86/AndroidConfig.h b/core/combo/include/arch/linux-x86/AndroidConfig.h index 2fc768d..2400834 100644 --- a/core/combo/include/arch/linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/linux-x86/AndroidConfig.h @@ -188,11 +188,6 @@ #define HAVE_PREAD 1 /* - * Define if we have st_mtim in struct stat - */ -#define HAVE_STAT_ST_MTIM 1 - -/* * Define if printf() supports %zd for size_t arguments */ #define HAVE_PRINTF_ZD 1 diff --git a/core/combo/include/arch/target_linux-x86/AndroidConfig.h b/core/combo/include/arch/target_linux-x86/AndroidConfig.h index 253b204..32df383 100644 --- a/core/combo/include/arch/target_linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/target_linux-x86/AndroidConfig.h @@ -193,11 +193,6 @@ #define HAVE_PREAD 1 /* - * Define if we have st_mtim in struct stat - */ -#define HAVE_STAT_ST_MTIM 1 - -/* * Define if printf() supports %zd for size_t arguments */ #define HAVE_PRINTF_ZD 1 diff --git a/libs/host/CopyFile.c b/libs/host/CopyFile.c index ca52565..f0c8fe5 100644 --- a/libs/host/CopyFile.c +++ b/libs/host/CopyFile.c @@ -68,15 +68,13 @@ static bool isSourceNewer(const struct stat* pSrcStat, const struct stat* pDstSt */ static bool isHiresMtime(const struct stat* pSrcStat) { -#if HAVE_STAT_ST_MTIM -#if defined(MACOSX_RSRC) +#if defined(__CYGWIN__) || defined(__MINGW32__) + return 0; +#elif defined(MACOSX_RSRC) return pSrcStat->st_mtimespec.tv_nsec > 0; #else return pSrcStat->st_mtim.tv_nsec > 0; #endif -#else - return 0; -#endif } /* |