From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 19 Nov 1998 01:07:03 +0000 (+0000)
Subject: Update lutil based on recent -devel changes.
X-Git-Tag: OPENLDAP_REL_ENG_1_1_ALPHA3~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b06200f6a0141003cd826fc89095ed191d13a7ef;p=thirdparty%2Fopenldap.git

Update lutil based on recent -devel changes.
  passwd.c in OBJS
  memcmp/strdup macro protection
---

diff --git a/libraries/liblutil/Makefile.in b/libraries/liblutil/Makefile.in
index a1cf5ab72e..db5d901948 100644
--- a/libraries/liblutil/Makefile.in
+++ b/libraries/liblutil/Makefile.in
@@ -4,7 +4,7 @@
 
 LIBRARY	= liblutil.a
 SRCS	= base64.c detach.c md5.c passwd.c sha1.c
-OBJS	= base64.o detach.o md5.o passwd.c sha1.o @LIBOBJS@
+OBJS	= base64.o detach.o md5.o passwd.o sha1.o @LIBOBJS@
 
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
diff --git a/libraries/liblutil/memcmp.c b/libraries/liblutil/memcmp.c
index b2c575d955..99daac2d0b 100644
--- a/libraries/liblutil/memcmp.c
+++ b/libraries/liblutil/memcmp.c
@@ -6,10 +6,10 @@
  * Memory Compare
  */
 int
-memcmp(const void *v1, const void *v2, int n) 
+(memcmp)(const void *v1, const void *v2, int n) 
 {
     if (n != 0) {
-		register const unsigned char *s1=v1, *s2=v2;
+		const unsigned char *s1=v1, *s2=v2;
         do {
             if (*s1++ != *s2++)
                 return (*--s1 - *--s2);
diff --git a/libraries/liblutil/strdup.c b/libraries/liblutil/strdup.c
index 31baa12b30..27b0d81d54 100644
--- a/libraries/liblutil/strdup.c
+++ b/libraries/liblutil/strdup.c
@@ -6,7 +6,7 @@
 #include <ac/string.h>
 #include "lutil.h"
 
-char *strdup( const char *s )
+char *(strdup)( const char *s )
 {
         char    *p;