[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 f78f4e7ad2776bc96fe6652fc45b9f6e44c3f2c8..1f92409bae8a83a4268bada59fb5b5b2b240c0bc 100644 (file)
--- 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 7672a7946b4c50bbc9e8a1eebe089e93e41d5d58..0e279901667e8e6aa60c9ba1876cd650aadab155 100644 (file)
--- 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 59ed8ec1d21dfc054aab13e2242a082d5af873fc..e6327c9b6412c2c3be663887ec2a9940e16b63c7 100644 (file)
--- 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.
  */