add new logging macros/defs (behind NEW_LOGGING)

diff --git a/libraries/liblber/lber-int.h b/libraries/liblber/lber-int.h
index 50cfe472be049fbda2b69ca0c6ed9283ff30a06a..78cac6d0a08ac96c5366ce2fe389f454a381a85a 100644 (file)
--- a/libraries/liblber/lber-int.h
+++ b/libraries/liblber/lber-int.h
@@ -33,10 +33,18 @@ struct lber_options {
        long            lbo_meminuse;
 };
 
-#ifdef LDAP_LOG
-#undef LDAP_LOG
+#ifdef NEW_LOGGING
+#    ifdef LDAP_DEBUG
+#        ifdef LDAP_LOG
+#            undef LDAP_LOG
+#        endif
+#        define LDAP_LOG(a) ber_pvt_log_output a
+#        define BER_DUMP(a) ber_output_dump a
+#    else
+#        define LDAP_LOG(a)
+#        define BER_DUMP(a)
+#    endif
 #endif
-#define LDAP_LOG(a) ber_pvt_log_output a
 
 #define LBER_UNINITIALIZED             0x0
 #define LBER_INITIALIZED               0x1
@@ -107,6 +115,15 @@ int ber_realloc LDAP_P((
  */
 #define ber_log_printf ber_pvt_log_printf
 
+#ifdef NEW_LOGGING
+LBER_F( int )
+ber_output_dump LDAP_P((
+                        char *subsys,
+                        int level,
+                        BerElement *ber,
+                        int inout ));
+#endif
+
 LBER_F( int )
 ber_log_bprint LDAP_P((
        int errlvl,