Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/libc/md/mdXhl.c,v
rcsdiff: /ftp/cvs/cvsroot/src/lib/libc/md/mdXhl.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- src/lib/libc/md/mdXhl.c	2005/09/26 03:01:41	1.7
+++ src/lib/libc/md/mdXhl.c	2009/03/06 18:15:24	1.8
@@ -1,4 +1,4 @@
-/*	$NetBSD: mdXhl.c,v 1.7 2005/09/26 03:01:41 christos Exp $	*/
+/*	$NetBSD: mdXhl.c,v 1.8 2009/03/06 18:15:24 apb Exp $	*/
 
 /*
  * ----------------------------------------------------------------------------
@@ -15,10 +15,14 @@
  * Modified April 29, 1997 by Jason R. Thorpe <thorpej@NetBSD.org>
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #define	CONCAT(x,y)	__CONCAT(x,y)
 #define	MDNAME(x)	CONCAT(MDALGORITHM,x)
 
-#if !defined(_KERNEL) && defined(__weak_alias)
+#if !defined(_KERNEL) && defined(__weak_alias) && !defined(HAVE_NBTOOL_CONFIG_H)
 #define	WA(a,b)	__weak_alias(a,b)
 WA(MDNAME(End),CONCAT(_,MDNAME(End)))
 WA(MDNAME(File),CONCAT(_,MDNAME(File)))
@@ -38,10 +42,6 @@ WA(MDNAME(Data),CONCAT(_,MDNAME(Data)))
 #include <stdlib.h>
 #include <unistd.h>
 
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
 
 
 char *