From b5a34c3190d62294dc0316c93251baa807b26c9e Mon Sep 17 00:00:00 2001 From: Ell Date: Sun, 17 Feb 2019 13:33:10 -0500 Subject: [PATCH] plug-ins: in file-dds, rename endian.h to endian_rw.h ... ... to avoid clashing with the system Thanks Andrea! --- plug-ins/file-dds/Makefile.am | 2 +- plug-ins/file-dds/ddsread.c | 2 +- plug-ins/file-dds/ddswrite.c | 2 +- plug-ins/file-dds/dxt.c | 2 +- plug-ins/file-dds/{endian.h => endian_rw.h} | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename plug-ins/file-dds/{endian.h => endian_rw.h} (95%) diff --git a/plug-ins/file-dds/Makefile.am b/plug-ins/file-dds/Makefile.am index 9c4aa8fb3a..b62d822fbc 100644 --- a/plug-ins/file-dds/Makefile.am +++ b/plug-ins/file-dds/Makefile.am @@ -35,7 +35,7 @@ file_dds_SOURCES = \ dxt.c \ dxt.h \ dxt_tables.h \ - endian.h \ + endian_rw.h \ imath.h \ mipmap.c \ mipmap.h \ diff --git a/plug-ins/file-dds/ddsread.c b/plug-ins/file-dds/ddsread.c index d263897d9c..d63640b18b 100644 --- a/plug-ins/file-dds/ddsread.c +++ b/plug-ins/file-dds/ddsread.c @@ -45,7 +45,7 @@ #include "ddsplugin.h" #include "dds.h" #include "dxt.h" -#include "endian.h" +#include "endian_rw.h" #include "misc.h" #include "imath.h" diff --git a/plug-ins/file-dds/ddswrite.c b/plug-ins/file-dds/ddswrite.c index b19b3c6cc5..58733904e1 100644 --- a/plug-ins/file-dds/ddswrite.c +++ b/plug-ins/file-dds/ddswrite.c @@ -39,7 +39,7 @@ #include "dds.h" #include "dxt.h" #include "mipmap.h" -#include "endian.h" +#include "endian_rw.h" #include "imath.h" #include "color.h" diff --git a/plug-ins/file-dds/dxt.c b/plug-ins/file-dds/dxt.c index 8ebbe98123..cbd542685e 100644 --- a/plug-ins/file-dds/dxt.c +++ b/plug-ins/file-dds/dxt.c @@ -36,7 +36,7 @@ #include "dds.h" #include "dxt.h" -#include "endian.h" +#include "endian_rw.h" #include "mipmap.h" #include "imath.h" #include "vec.h" diff --git a/plug-ins/file-dds/endian.h b/plug-ins/file-dds/endian_rw.h similarity index 95% rename from plug-ins/file-dds/endian.h rename to plug-ins/file-dds/endian_rw.h index 53d32f2dc5..97d1f60c81 100644 --- a/plug-ins/file-dds/endian.h +++ b/plug-ins/file-dds/endian_rw.h @@ -20,8 +20,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef ENDIAN_H -#define ENDIAN_H +#ifndef ENDIAN_RW_H +#define ENDIAN_RW_H #define GETL64(buf) \ (((unsigned long long)(buf)[0] ) | \