Add strdup.c from -llutil, renamed to ldap_strdup() and always used.

[openldap] / libraries / libldap / tmpltest.c

diff --git a/libraries/libldap/tmpltest.c b/libraries/libldap/tmpltest.c
index 5a0796b4732fafb35b6c6da4fba7cbca1dbf9d09..9855317b560cc01d265f28616a87dfaae3e0ef2f 100644 (file)
--- a/libraries/libldap/tmpltest.c
+++ b/libraries/libldap/tmpltest.c
@@ -1,8 +1,12 @@
+#include "portable.h"
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
 
-#ifdef MACOS
+#include <ac/socket.h>
+#include <ac/time.h>
+
+#ifdef HAVE_CONSOLE_H
 #include <console.h>
 #endif /* MACOS */
 
@@ -11,13 +15,8 @@
 #include "disptmpl.h"
 #include "srchpref.h"
 
-#ifdef NEEDPROTOS
-void dump_tmpl( struct ldap_disptmpl *tmpl );
-void dump_srchpref( struct ldap_searchobj *sp );
-#else /* NEEDPROTOS */
-void dump_tmpl();
-void dump_srchpref();
-#endif /* NEEDPROTOS */
+static void dump_tmpl   ( struct ldap_disptmpl *tmpl );
+static void dump_srchpref( struct ldap_searchobj *sp );
 
 #define NULLSTRINGIFNULL( s )  ( s == NULL ? "(null)" : s )
 
@@ -28,7 +27,7 @@ main( int argc, char **argv )
     struct ldap_searchobj      *so, *sop;
     int                                err;
 
-#ifdef MACOS
+#ifdef HAVE_CONSOLE_H
        ccommand( &argv );
        for ( argc = 0; argv[ argc ] != NULL; ++argc ) {
            ;