Rename time.h to dostime.h to prevent conflicts with older compilers.

This commit is contained in:
2021-04-06 04:10:28 +01:00
parent 15f0b7b534
commit 8424af120c
3 changed files with 19 additions and 19 deletions

View File

@@ -30,7 +30,7 @@ project(fssetter-dos
DESCRIPTION "Filesystem test creator for DOS"
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.h time.c volume.c xattr.c dos.c attr.h dosuname.c dosuname.h dosdefs.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 dostime.h time.c volume.c xattr.c dos.c attr.h dosuname.c dosuname.h dosdefs.h)
set(EXECUTABLE_NAME "fssetter")

View File

@@ -31,11 +31,11 @@ Copyright (C) 2011-2021 Natalia Portillo
typedef struct
{
char filename[9];
unsigned short date;
unsigned short time;
unsigned short function;
char definition[13];
char filename[9];
unsigned short date;
unsigned short time;
unsigned short function;
char definition[13];
} dos_time_tests_t;
#define KNOWN_DOS_TIMES 12
@@ -51,18 +51,18 @@ typedef struct
#define MIN_DATE 0x0021
static const dos_time_tests_t dos_times[KNOWN_DOS_TIMES] = {
{"MAXCTIME",MAX_DATE, MAX_TIME, WIN_SET_CREATION_DATE_AND_TIME, "creation"},
{"MINCTIME",MIN_DATE, 0, WIN_SET_CREATION_DATE_AND_TIME, "creation"},
{"Y19CTIME",Y1K_DATE, MAX_TIME, WIN_SET_CREATION_DATE_AND_TIME, "creation"},
{"Y2KCTIME",Y2K_DATE, MAX_TIME, WIN_SET_CREATION_DATE_AND_TIME, "creation"},
{"MAXWTIME",MAX_DATE, MAX_TIME, DOS_SET_LAST_WRITTEN_DATE_AND_TIME, "last written"},
{"MINWTIME",MIN_DATE, 0, DOS_SET_LAST_WRITTEN_DATE_AND_TIME, "last written"},
{"Y19WTIME",Y1K_DATE, MAX_TIME, DOS_SET_LAST_WRITTEN_DATE_AND_TIME, "last written"},
{"Y2KWTIME",Y2K_DATE, MAX_TIME, DOS_SET_LAST_WRITTEN_DATE_AND_TIME, "last written"},
{"MAXATIME",MAX_DATE, MAX_TIME, WIN_SET_LAST_ACCESS_DATE_AND_TIME, "last access"},
{"MINATIME",MIN_DATE, 0, WIN_SET_LAST_ACCESS_DATE_AND_TIME, "last access"},
{"Y19ATIME",Y1K_DATE, MAX_TIME, WIN_SET_LAST_ACCESS_DATE_AND_TIME, "last access"},
{"Y2KATIME",Y2K_DATE, MAX_TIME, WIN_SET_LAST_ACCESS_DATE_AND_TIME, "last access"},
{"MAXCTIME", MAX_DATE, MAX_TIME, WIN_SET_CREATION_DATE_AND_TIME, "creation"},
{"MINCTIME", MIN_DATE, 0, WIN_SET_CREATION_DATE_AND_TIME, "creation"},
{"Y19CTIME", Y1K_DATE, MAX_TIME, WIN_SET_CREATION_DATE_AND_TIME, "creation"},
{"Y2KCTIME", Y2K_DATE, MAX_TIME, WIN_SET_CREATION_DATE_AND_TIME, "creation"},
{"MAXWTIME", MAX_DATE, MAX_TIME, DOS_SET_LAST_WRITTEN_DATE_AND_TIME, "last written"},
{"MINWTIME", MIN_DATE, 0, DOS_SET_LAST_WRITTEN_DATE_AND_TIME, "last written"},
{"Y19WTIME", Y1K_DATE, MAX_TIME, DOS_SET_LAST_WRITTEN_DATE_AND_TIME, "last written"},
{"Y2KWTIME", Y2K_DATE, MAX_TIME, DOS_SET_LAST_WRITTEN_DATE_AND_TIME, "last written"},
{"MAXATIME", MAX_DATE, MAX_TIME, WIN_SET_LAST_ACCESS_DATE_AND_TIME, "last access"},
{"MINATIME", MIN_DATE, 0, WIN_SET_LAST_ACCESS_DATE_AND_TIME, "last access"},
{"Y19ATIME", Y1K_DATE, MAX_TIME, WIN_SET_LAST_ACCESS_DATE_AND_TIME, "last access"},
{"Y2KATIME", Y2K_DATE, MAX_TIME, WIN_SET_LAST_ACCESS_DATE_AND_TIME, "last access"},
};
#endif // AARU_FSTESTER_SETTER_SRC_DOS_TIME_H_

View File

@@ -36,7 +36,7 @@ Copyright (C) 2011-2021 Natalia Portillo
#include "../include/defs.h"
#include "../log.h"
#include "dosdefs.h"
#include "time.h"
#include "dostime.h"
void Timestamps(const char* path)
{