From fc43f0225012f5dfb039a879d738c72ca406bfba Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 30 Mar 2021 04:45:07 +0100 Subject: [PATCH] Fix includes in UNIX. --- setter/src/unix/os.c | 1 - setter/src/unix/volume.c | 2 +- setter/src/unix/{unix.h => volume.h} | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) rename setter/src/unix/{unix.h => volume.h} (98%) diff --git a/setter/src/unix/os.c b/setter/src/unix/os.c index 0ca386a..e5e8da9 100644 --- a/setter/src/unix/os.c +++ b/setter/src/unix/os.c @@ -26,7 +26,6 @@ Copyright (C) 2011-2021 Natalia Portillo #include "../darwin/darwin.h" #else #include -#include #include #include "../log.h" diff --git a/setter/src/unix/volume.c b/setter/src/unix/volume.c index 4a178a3..cecc06a 100644 --- a/setter/src/unix/volume.c +++ b/setter/src/unix/volume.c @@ -37,7 +37,7 @@ Copyright (C) 2011-2021 Natalia Portillo #include "../include/defs.h" #include "../log.h" -#include "unix.h" +#include "volume.h" #if defined(__linux__) || defined(__LINUX__) || defined(__gnu_linux) #include "../linux/linux.h" diff --git a/setter/src/unix/unix.h b/setter/src/unix/volume.h similarity index 98% rename from setter/src/unix/unix.h rename to setter/src/unix/volume.h index a811377..43d391f 100644 --- a/setter/src/unix/unix.h +++ b/setter/src/unix/volume.h @@ -22,8 +22,8 @@ Aaru Data Preservation Suite Copyright (C) 2011-2021 Natalia Portillo *****************************************************************************/ -#ifndef AARU_FSTESTER_SETTER_UNIX_H -#define AARU_FSTESTER_SETTER_UNIX_H +#ifndef AARU_FSTESTER_SETTER_UNIX_VOLUME_H +#define AARU_FSTESTER_SETTER_UNIX_VOLUME_H #ifndef ADFS_SUPER_MAGIC #define ADFS_SUPER_MAGIC 0xadf5 @@ -349,4 +349,4 @@ Copyright (C) 2011-2021 Natalia Portillo #define _XIAFS_SUPER_MAGIC 0x012fd16d #endif -#endif // AARU_FSTESTER_SETTER_UNIX_H +#endif // AARU_FSTESTER_SETTER_UNIX_VOLUME_H