- (djm) [openbsd-compat/sha2.h] Avoid include macro clash with

   system sha2.h

diff --git a/ChangeLog b/ChangeLog
index 18fdd50a5476c8547ec8938baa93a8e8139cd273..b69a7c11a50cc4af3ac1581879e652770db80020 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -252,6 +252,8 @@
  - (djm) [md-sha256.c configure.ac] md-sha256.c needs sha2.h if present
  - (djm) [regress/.cvsignore] Ignore Makefile here
  - (djm) [loginrec.c] Need stat.h
+ - (djm) [openbsd-compat/sha2.h] Avoid include macro clash with
+   system sha2.h
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)

diff --git a/openbsd-compat/sha2.h b/openbsd-compat/sha2.h
index fb40bde43ba0cb2b0c153a8f5c06e3c81d74cba2..5e2641c4bc3fa9975a3f963b542c2c68274731ad 100755 (executable)
--- a/openbsd-compat/sha2.h
+++ b/openbsd-compat/sha2.h
@@ -36,8 +36,8 @@
 
 /* OPENBSD ORIGINAL: include/sha2.h */
 
-#ifndef _SHA2_H
-#define _SHA2_H
+#ifndef _SSHSHA2_H
+#define _SSHSHA2_H
 
 #include "includes.h"
 
@@ -122,4 +122,4 @@ char *SHA512_Data(const u_int8_t *, size_t, char *)
 
 #endif /* !defined(HAVE_SHA256_UPDATE) && !defined(HAVE_EVP_SHA256) */
 
-#endif /* _SHA2_H */
+#endif /* _SSHSHA2_H */