Download raw body.
[PATCH 3/4] portable: rename compat/{sha2.h -> bsd-sha2.h}
Avoid include conflict with libmd's <sha2.h>
---
compat/Makefile.am | 2 +-
compat/{sha2.h => bsd-sha2.h} | 0
include/got_compat2.h | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename compat/{sha2.h => bsd-sha2.h} (100%)
diff --git a/compat/Makefile.am b/compat/Makefile.am
index 18a782098..ecf90e009 100644
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -74,7 +74,7 @@ if !HOST_DARWIN
# it's a dummy assignment.
NOTING=something
if !HAVE_SHA2
-libopenbsd_compat_a_SOURCES += sha2.c sha2.h
+libopenbsd_compat_a_SOURCES += sha2.c bsd-sha2.h
endif
endif
diff --git a/compat/sha2.h b/compat/bsd-sha2.h
similarity index 100%
rename from compat/sha2.h
rename to compat/bsd-sha2.h
diff --git a/include/got_compat2.h b/include/got_compat2.h
index 68c02fe36..e21594ac1 100644
--- a/include/got_compat2.h
+++ b/include/got_compat2.h
@@ -232,7 +232,7 @@ typedef struct _SHA2_CTX {
#ifdef HAVE_SHA2_H
# include <sha2.h>
#else
-# include "sha2.h"
+# include "bsd-sha2.h"
#endif
#ifdef HAVE_SHA256_H
# include <sha256.h>
--
2.40.0
[PATCH 3/4] portable: rename compat/{sha2.h -> bsd-sha2.h}