diff options
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Hash.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Common/MemArenaUnix.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/Common/TimeUtil.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp index a3984745f5..3756bdcad4 100644 --- a/Source/Core/Common/Hash.cpp +++ b/Source/Core/Common/Hash.cpp @@ -427,7 +427,7 @@ u64 GetHash64(const u8* src, u32 len, u32 samples) u32 StartCRC32() { - return crc32_z(0L, Z_NULL, 0); + return crc32_z(0L, nullptr, 0); } u32 UpdateCRC32(u32 crc, const u8* data, size_t len) diff --git a/Source/Core/Common/MemArenaUnix.cpp b/Source/Core/Common/MemArenaUnix.cpp index fd4af4e74b..26a123c081 100644 --- a/Source/Core/Common/MemArenaUnix.cpp +++ b/Source/Core/Common/MemArenaUnix.cpp @@ -149,8 +149,8 @@ void* LazyMemoryRegion::Create(size_t size) if (size == 0) return nullptr; - void* memory = - mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0); + void* memory = mmap(nullptr, size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0); if (memory == MAP_FAILED) { NOTICE_LOG_FMT(MEMMAP, "Memory allocation of {} bytes failed.", size); diff --git a/Source/Core/Common/TimeUtil.cpp b/Source/Core/Common/TimeUtil.cpp index e57078b7e9..fa47e23503 100644 --- a/Source/Core/Common/TimeUtil.cpp +++ b/Source/Core/Common/TimeUtil.cpp @@ -17,7 +17,7 @@ std::optional<std::tm> LocalTime(std::time_t time) #ifdef _MSC_VER if (localtime_s(&local_time, &time) != 0) #else - if (localtime_r(&time, &local_time) == NULL) + if (localtime_r(&time, &local_time) == nullptr) #endif { ERROR_LOG_FMT(COMMON, "Failed to convert time to local time: {}", std::strerror(errno)); |
