diff options
author | Sylvestre Ledru <sylvestre@debian.org> | 2012-04-23 16:37:23 +0000 |
---|---|---|
committer | Sylvestre Ledru <sylvestre@debian.org> | 2012-04-23 16:37:23 +0000 |
commit | 9dc06bd431c826f068a5217718e2171303782f7a (patch) | |
tree | 9246af6ef2936f2f39ecc2a5ca5c6bc753367fae /include/llvm/Support/FileSystem.h | |
parent | 55cabae685991ac6bc6d96b14e2139f64a0c9967 (diff) |
Conflict with st_dev/st_ino identifiers under Debian GNU/Hurd
The problem is that the struct file_status on UNIX systems has two
members called st_dev and st_ino; those are also members of the
struct stat, and they are reserved identifiers which can also be
provided as #define (and this is the case for st_dev on Hurd).
The solution (attached) is to rename them, for example adding a
"fs_" prefix (= file status) to them.
Patch by Pino Toscano
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@155354 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/Support/FileSystem.h')
-rw-r--r-- | include/llvm/Support/FileSystem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/llvm/Support/FileSystem.h b/include/llvm/Support/FileSystem.h index e6f9926af6..3fd5301d03 100644 --- a/include/llvm/Support/FileSystem.h +++ b/include/llvm/Support/FileSystem.h @@ -99,8 +99,8 @@ struct space_info { class file_status { #if defined(LLVM_ON_UNIX) - dev_t st_dev; - ino_t st_ino; + dev_t fs_st_dev; + ino_t fs_st_ino; #elif defined (LLVM_ON_WIN32) uint32_t LastWriteTimeHigh; uint32_t LastWriteTimeLow; |