]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Fix merge botch.
authorFrederick Bruckman <bruckman@ntp.org>
Wed, 25 Jun 2003 22:33:22 +0000 (17:33 -0500)
committerFrederick Bruckman <bruckman@ntp.org>
Wed, 25 Jun 2003 22:33:22 +0000 (17:33 -0500)
bk: 3efa2332jOd2Cn_dkgAN3pgZudrFDQ

libntp/a_md5encrypt.c

index 44c539188365609b8c551d05066f157e6d97f986..42513ef534805c44c89c93e25f712e1ffe9448f8 100644 (file)
@@ -16,7 +16,9 @@
 #include "ntp_string.h"
 #include "ntp_stdlib.h"
 
-/* Disable the openssl md5 includes because it clash with ours. */
+/* Disable the openssl md5 includes, because they'd clash with ours. */
+/* #define NO_MD5 */
+/* #define OPENSSL_NO_MD5 */
 #undef OPENSSL
 
 #include "ntp.h"