diff options
Diffstat (limited to 'graphics/openusd/files/patch-pxr_base_arch_fileSystem.cpp')
| -rw-r--r-- | graphics/openusd/files/patch-pxr_base_arch_fileSystem.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/graphics/openusd/files/patch-pxr_base_arch_fileSystem.cpp b/graphics/openusd/files/patch-pxr_base_arch_fileSystem.cpp index 4083b8c629c5..9216ff9a354c 100644 --- a/graphics/openusd/files/patch-pxr_base_arch_fileSystem.cpp +++ b/graphics/openusd/files/patch-pxr_base_arch_fileSystem.cpp @@ -1,4 +1,4 @@ ---- pxr/base/arch/fileSystem.cpp.orig 2025-10-24 16:21:56 UTC +--- pxr/base/arch/fileSystem.cpp.orig 2026-04-24 18:55:54 UTC +++ pxr/base/arch/fileSystem.cpp @@ -35,12 +35,24 @@ #include <Windows.h> @@ -22,10 +22,10 @@ +#include <sys/user.h> +#endif + - PXR_NAMESPACE_OPEN_SCOPE - - using std::pair; -@@ -143,7 +155,7 @@ ArchStatIsWritable(const ArchStatType *st) + #if defined(ARCH_OS_DARWIN) + #include "pxr/base/arch/darwin.h" + #endif +@@ -147,7 +159,7 @@ ArchStatIsWritable(const ArchStatType *st) bool ArchStatIsWritable(const ArchStatType *st) { @@ -34,7 +34,7 @@ defined(ARCH_OS_WASM_VM) if (st) { return (st->st_mode & S_IWOTH) || -@@ -181,7 +193,7 @@ ArchGetModificationTime(const ArchStatType& st) +@@ -185,7 +197,7 @@ ArchGetModificationTime(const ArchStatType& st) double ArchGetModificationTime(const ArchStatType& st) { @@ -43,7 +43,7 @@ return st.st_mtim.tv_sec + 1e-9*st.st_mtim.tv_nsec; #elif defined(ARCH_OS_DARWIN) return st.st_mtimespec.tv_sec + 1e-9*st.st_mtimespec.tv_nsec; -@@ -433,7 +445,7 @@ ArchGetAccessTime(const struct stat& st) +@@ -437,7 +449,7 @@ ArchGetAccessTime(const struct stat& st) double ArchGetAccessTime(const struct stat& st) { @@ -52,7 +52,7 @@ return st.st_atim.tv_sec + 1e-9*st.st_atim.tv_nsec; #elif defined(ARCH_OS_DARWIN) return st.st_atimespec.tv_sec + 1e-9*st.st_atimespec.tv_nsec; -@@ -448,7 +460,7 @@ ArchGetStatusChangeTime(const struct stat& st) +@@ -452,7 +464,7 @@ ArchGetStatusChangeTime(const struct stat& st) double ArchGetStatusChangeTime(const struct stat& st) { @@ -61,7 +61,7 @@ return st.st_ctim.tv_sec + 1e-9*st.st_ctim.tv_nsec; #elif defined(ARCH_OS_DARWIN) return st.st_ctimespec.tv_sec + 1e-9*st.st_ctimespec.tv_nsec; -@@ -479,7 +491,7 @@ ArchGetFileLength(FILE *file) +@@ -483,7 +495,7 @@ ArchGetFileLength(FILE *file) if (!file) return -1; #if defined (ARCH_OS_LINUX) || defined (ARCH_OS_DARWIN) || \ @@ -70,7 +70,7 @@ struct stat buf; return fstat(fileno(file), &buf) < 0 ? -1 : static_cast<int64_t>(buf.st_size); -@@ -494,7 +506,7 @@ ArchGetFileLength(const char* fileName) +@@ -498,7 +510,7 @@ ArchGetFileLength(const char* fileName) ArchGetFileLength(const char* fileName) { #if defined (ARCH_OS_LINUX) || defined (ARCH_OS_DARWIN) || \ @@ -79,7 +79,7 @@ struct stat buf; return stat(fileName, &buf) < 0 ? -1 : static_cast<int64_t>(buf.st_size); #elif defined (ARCH_OS_WINDOWS) -@@ -557,7 +569,49 @@ ArchGetFileName(FILE *file) +@@ -561,7 +573,49 @@ ArchGetFileName(FILE *file) std::filesystem::path(filePath.begin(), filePath.begin() + dwSize)); result = ArchWindowsUtf16ToUtf8(canonicalPath.wstring()); } @@ -130,7 +130,7 @@ #else #error Unknown system architecture #endif -@@ -920,6 +974,9 @@ ArchQueryMappedMemoryResidency( +@@ -925,6 +979,9 @@ ArchQueryMappedMemoryResidency( int ret = mincore( reinterpret_cast<caddr_t>(const_cast<void *>(addr)), len, reinterpret_cast<char *>(pageMap)); |