RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-02-27 16:38:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Conflict with st_dev/st_ino identifiers under Debian GNU/Hurd

Browse Source 
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
This commit is contained in:
Sylvestre Ledru 2012-04-23 16:37:23 +00:00
parent 55cabae685
commit 9dc06bd431
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/Support/FileSystem.h
View File

@ -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;

8
lib/Support/Unix/PathV2.inc
View File

@ -285,8 +285,8 @@ error_code exists(const Twine &path, bool &result) {
bool equivalent(file_status A, file_status B) {
assert(status_known(A) && status_known(B));
return A.st_dev == B.st_dev &&
A.st_ino == B.st_ino;
return A.fs_st_dev == B.fs_st_dev &&
A.fs_st_ino == B.fs_st_ino;
}
error_code equivalent(const Twine &A, const Twine &B, bool &result) {
@ -340,8 +340,8 @@ error_code status(const Twine &path, file_status &result) {
else
result = file_status(file_type::type_unknown);
result.st_dev = status.st_dev;
result.st_ino = status.st_ino;
result.fs_st_dev = status.st_dev;
result.fs_st_ino = status.st_ino;
return error_code::success();
}