Only set URANDOM_DEVICE if undef

[openldap] / include / ldap_log.h

diff --git a/include/ldap_log.h b/include/ldap_log.h
index 8761eb38cf7d089aea2640ea6172c0763ea8bb13..d52358d430558598e110052dec0b62c8cd65f9b9 100644 (file)
--- a/include/ldap_log.h
+++ b/include/ldap_log.h
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -39,13 +40,17 @@ LDAP_BEGIN_DECL
 #define LDAP_DEBUG_SHELL       0x0400
 #define LDAP_DEBUG_PARSE       0x0800
 
-#define LDAP_DEBUG_DEPRECIATED 0x1000
+#define LDAP_DEBUG_DEPRECATED  0x1000
 #define LDAP_DEBUG_NONE                0x8000
 #define LDAP_DEBUG_ANY         -1
 
 /* debugging stuff */
 #ifdef LDAP_DEBUG
 
+/*
+ * This is a bogus extern declaration for the compiler. No need to ensure
+ * a 'proper' dllimport.
+ */
 #ifndef ldap_debug
 extern int     ldap_debug;
 #endif /* !ldap_debug */
@@ -58,25 +63,25 @@ extern int  ldap_syslog_level;
 /* this doesn't below as part of ldap.h */
 #ifdef LDAP_SYSLOG
 #define Debug( level, fmt, arg1, arg2, arg3 )  \
-       { \
-               if ( ldap_debug & (level) ) \
-                       fprintf( stderr, (fmt), (arg1), (arg2), (arg3) ); \
+       do { \
+               lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) ); \
                if ( ldap_syslog & (level) ) \
                        syslog( ldap_syslog_level, (fmt), (arg1), (arg2), (arg3) ); \
-       }
-#else /* LDAP_SYSLOG */
-#ifndef WINSOCK
+       } while ( 0 )
+
+#else
 #define Debug( level, fmt, arg1, arg2, arg3 ) \
-               if ( ldap_debug & (level) ) \
-                       fprintf( stderr, (fmt), (arg1), (arg2), (arg3) );
-#else /* !WINSOCK */
-extern void Debug( int level, char* fmt, ... );
-#endif /* !WINSOCK */
-#endif /* LDAP_SYSLOG */
+       lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) )
+#endif
+
 #else /* LDAP_DEBUG */
 #define Debug( level, fmt, arg1, arg2, arg3 )
 #endif /* LDAP_DEBUG */
 
+LDAP_LUTIL_F(void) lutil_debug LDAP_P((
+       int debug, int level,
+       const char* fmt, ... )) LDAP_GCCATTR((format(printf, 3, 4)));
+
 LDAP_END_DECL
 
 #endif /* _LDAP_LOG_H */