From 5f5f854dc3d0f89cd1681e85b78104fd48aeacc6 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Wed, 7 Apr 2021 01:41:18 +0100 Subject: [PATCH] Rename time.h to timew32.h to prevent conflicts with older compilers. --- setter/src/win32/CMakeLists.txt | 2 +- setter/src/win32/time.c | 4 +--- setter/src/win32/{time.h => timew32.h} | 0 3 files changed, 2 insertions(+), 4 deletions(-) rename setter/src/win32/{time.h => timew32.h} (100%) diff --git a/setter/src/win32/CMakeLists.txt b/setter/src/win32/CMakeLists.txt index b00f582..82ff0d2 100644 --- a/setter/src/win32/CMakeLists.txt +++ b/setter/src/win32/CMakeLists.txt @@ -31,7 +31,7 @@ project( DESCRIPTION "Filesystem test creator for 32-bit and 64-bit Windows" LANGUAGES C) -set(PLATFORM_SOURCES attr.c deleted.c dirdepth.c filename.c files.c frag.c links.c os.c perms.c rsrcfork.c sparse.c time.c volume.c xattr.c attr.h rsrcfork.h xattr.h links.h volume.h time.h os.h sparse.h) +set(PLATFORM_SOURCES attr.c deleted.c dirdepth.c filename.c files.c frag.c links.c os.c perms.c rsrcfork.c sparse.c time.c volume.c xattr.c attr.h rsrcfork.h xattr.h links.h volume.h timew32.h os.h sparse.h) set(EXECUTABLE_NAME "fssetter-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}") diff --git a/setter/src/win32/time.c b/setter/src/win32/time.c index 1a24d02..462513a 100644 --- a/setter/src/win32/time.c +++ b/setter/src/win32/time.c @@ -33,11 +33,9 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include "win32.h" - -#include "time.h" - #include "../include/defs.h" #include "../log.h" +#include "timew32.h" void Timestamps(const char* path) { diff --git a/setter/src/win32/time.h b/setter/src/win32/timew32.h similarity index 100% rename from setter/src/win32/time.h rename to setter/src/win32/timew32.h