Commit preliminary fix for ldap.conf base usage.

[openldap] / libraries / libldap / tmpltest.c

diff --git a/libraries/libldap/tmpltest.c b/libraries/libldap/tmpltest.c
index d10837579061a41ed6b0673e88c5c496ece35704..9855317b560cc01d265f28616a87dfaae3e0ef2f 100644 (file)
--- a/libraries/libldap/tmpltest.c
+++ b/libraries/libldap/tmpltest.c
@@ -1,27 +1,25 @@
-#include <stdio.h>
-#include <sys/types.h>
-#include "lber.h"
-#include "ldap.h"
-#include "disptmpl.h"
-#include "srchpref.h"
+#include "portable.h"
 
-#ifdef MACOS
+#include <stdio.h>
 #include <stdlib.h>
+
+#include <ac/socket.h>
+#include <ac/time.h>
+
+#ifdef HAVE_CONSOLE_H
 #include <console.h>
 #endif /* MACOS */
 
-#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 */
+#include "lber.h"
+#include "ldap.h"
+#include "disptmpl.h"
+#include "srchpref.h"
 
+static void dump_tmpl   ( struct ldap_disptmpl *tmpl );
+static void dump_srchpref( struct ldap_searchobj *sp );
 
 #define NULLSTRINGIFNULL( s )  ( s == NULL ? "(null)" : s )
 
-
 int
 main( int argc, char **argv )
 {
@@ -29,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 ) {
            ;