From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 6 Jun 2003 05:49:57 +0000 (-0400)
Subject: [bug 86] Rename md5.h to rsa_md5.h to avoid a conflict.
X-Git-Tag: NTP_4_1_80_RC1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c498e708f5587baecd56f463b2b8bfef1f1c8bba;p=thirdparty%2Fntp.git

[bug 86] Rename md5.h to rsa_md5.h to avoid a conflict.

bk: 3ee02b85y96CaCskLAWN5U5gB8KU6g
---

diff --git a/include/Makefile.am b/include/Makefile.am
index f78f4e7ad..1f92409ba 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -19,7 +19,6 @@ noinst_HEADERS = \
 	iosignal.h \
 	l_stdlib.h \
 	mbg_gps166.h \
-	md5.h \
 	mx4200.h \
 	ntif.h \
 	ntp.h \
@@ -53,5 +52,6 @@ noinst_HEADERS = \
 	parse.h \
 	parse_conf.h \
 	recvbuff.h \
+	rsa_md5.h \
 	trimble.h
 
diff --git a/include/md5.h b/include/rsa_md5.h
similarity index 100%
rename from include/md5.h
rename to include/rsa_md5.h
diff --git a/libntp/a_md5encrypt.c b/libntp/a_md5encrypt.c
index 7672a7946..0e2799016 100644
--- a/libntp/a_md5encrypt.c
+++ b/libntp/a_md5encrypt.c
@@ -26,7 +26,7 @@
 #include "ntp_stdlib.h"
 #include "ntp.h"
 #include "global.h"
-#include "md5.h"
+#include "rsa_md5.h"
 
 /*
  * MD5authencrypt - generate MD5 message authenticator
diff --git a/libntp/md5c.c b/libntp/md5c.c
index 59ed8ec1d..e6327c9b6 100644
--- a/libntp/md5c.c
+++ b/libntp/md5c.c
@@ -24,7 +24,7 @@
  */
 
 #include "global.h"
-#include "md5.h"
+#include "rsa_md5.h"
 
 /* Constants for MD5Transform routine.
  */