| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 25786d356ac391124489f2e55690281c03fa83db Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 22 Dec 2022 00:30:55 -0800 |
| 4 | Subject: [PATCH] Replace lstat64/stat64 functions on linux |
| 5 | |
| 6 | we define -D_FILE_OFFSET_BITS=64 which means lstat is operating on 64bit |
| 7 | off_t and is same as lstat64, same for stat and stat64 case. |
| 8 | |
| 9 | This fixes build with musl where off_t has always been 64bit |
| 10 | |
| 11 | Upstream-Status: Submitted [https://gn-review.googlesource.com/c/gn/+/14960] |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | --- |
| 14 | src/base/files/file.h | 2 +- |
| 15 | src/base/files/file_posix.cc | 2 +- |
| 16 | src/base/files/file_util_posix.cc | 2 +- |
| 17 | 3 files changed, 3 insertions(+), 3 deletions(-) |
| 18 | |
| 19 | diff --git a/src/base/files/file.h b/src/base/files/file.h |
| 20 | index 2c94eb4e..99e87ed9 100644 |
| 21 | --- a/src/base/files/file.h |
| 22 | +++ b/src/base/files/file.h |
| 23 | @@ -23,7 +23,7 @@ namespace base { |
| 24 | |
| 25 | #if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL) || \ |
| 26 | defined(OS_HAIKU) || defined(OS_MSYS) || defined(OS_ZOS) || \ |
| 27 | - defined(OS_ANDROID) && __ANDROID_API__ < 21 |
| 28 | + defined(OS_LINUX) || defined(OS_ANDROID) && __ANDROID_API__ < 21 |
| 29 | typedef struct stat stat_wrapper_t; |
| 30 | #elif defined(OS_POSIX) || defined(OS_FUCHSIA) |
| 31 | typedef struct stat64 stat_wrapper_t; |
| 32 | diff --git a/src/base/files/file_posix.cc b/src/base/files/file_posix.cc |
| 33 | index b1f9f5e8..049568f0 100644 |
| 34 | --- a/src/base/files/file_posix.cc |
| 35 | +++ b/src/base/files/file_posix.cc |
| 36 | @@ -26,7 +26,7 @@ namespace { |
| 37 | |
| 38 | #if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL) || \ |
| 39 | defined(OS_HAIKU) || defined(OS_MSYS) || defined(OS_ZOS) || \ |
| 40 | - defined(OS_ANDROID) && __ANDROID_API__ < 21 |
| 41 | + defined(OS_LINUX) || defined(OS_ANDROID) && __ANDROID_API__ < 21 |
| 42 | int CallFstat(int fd, stat_wrapper_t* sb) { |
| 43 | return fstat(fd, sb); |
| 44 | } |
| 45 | diff --git a/src/base/files/file_util_posix.cc b/src/base/files/file_util_posix.cc |
| 46 | index aa54731d..53be3d3b 100644 |
| 47 | --- a/src/base/files/file_util_posix.cc |
| 48 | +++ b/src/base/files/file_util_posix.cc |
| 49 | @@ -61,7 +61,7 @@ namespace { |
| 50 | |
| 51 | #if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL) || \ |
| 52 | defined(OS_HAIKU) || defined(OS_MSYS) || defined(OS_ZOS) || \ |
| 53 | - defined(OS_ANDROID) && __ANDROID_API__ < 21 |
| 54 | + defined(OS_LINUX) || defined(OS_ANDROID) && __ANDROID_API__ < 21 |
| 55 | int CallStat(const char* path, stat_wrapper_t* sb) { |
| 56 | return stat(path, sb); |
| 57 | } |
| 58 | -- |
| 59 | 2.39.0 |
| 60 | |