X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Flog.h;h=2485705d08a8b3a836c196997a2a503912b84867;hb=825d22351b1d59c71e98357b4931bf7bb67daa3a;hp=355949d36946d8c804a48be622e3fc773290e176;hpb=f4ed92d039e200b903bd7330a9fd58bd11d71825;p=yaz-moved-to-github.git

diff --git a/include/yaz/log.h b/include/yaz/log.h
index 355949d..2485705 100644
--- a/include/yaz/log.h
+++ b/include/yaz/log.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-2004, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
@@ -23,7 +23,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: log.h,v 1.29 2004-12-13 14:31:19 heikki Exp $
+ * $Id: log.h,v 1.32 2005-01-15 19:47:09 adam Exp $
  */
 
 /**
@@ -39,41 +39,6 @@
 
 YAZ_BEGIN_CDECL
 
-#ifndef YAZ_USE_NEW_LOG
-
-#include <yaz/xmalloc.h>
-
-/* The old LOG_ bit names are here for compatibility only. They may 
- * conflict with bits defined in syslog.h, or other places. 'LOG'
- * really is not such a good name. YLOG must be more unique
- */
-#define LOG_FATAL  YLOG_FATAL
-#define LOG_DEBUG  YLOG_DEBUG
-#define LOG_WARN   YLOG_WARN
-#define LOG_LOG    YLOG_LOG /* Deprecated, use the modern dynamic log levels*/
-#define LOG_ERRNO  YLOG_ERRNO 
-#define LOG_FILE   0x00000020 /* Deprecated - not in ylog.h at all*/
-#define LOG_APP    0x00000040 /* Deprecated - not in ylog.h at all*/
-#define LOG_MALLOC YLOG_MALLOC /* deprecated */
-#define LOG_NOTIME YLOG_NOTIME /* do not output date and time */
-#define LOG_APP2   0x00000200 /* Deprecated - not in ylog.h at all*/
-#define LOG_APP3   0x00000400 /* Deprecated - not in ylog.h at all*/
-#define LOG_FLUSH  YLOG_FLUSH 
- /*     LOG_LOGLVL is a new one in ylog.h. So new that no log.h users should
-  *     use it */
-
-#define LOG_ALL    YLOG_ALL
-
-#define LOG_DEFAULT_LEVEL YLOG_DEFAULT_LEVEL
-
-
-/* logf is deprecated, as it conflicts with a math function */
-#define logf yaz_log
-
-
-
-#endif /* ndef YAZ_USE_NEW_LOG */
-
 #define YLOG_FATAL  0x00000001
 #define YLOG_DEBUG  0x00000002
 #define YLOG_WARN   0x00000004
@@ -94,7 +59,10 @@ YAZ_BEGIN_CDECL
 
 #define YLOG_ALL   (0xffff&~YLOG_MALLOC&~YLOG_NOTIME)
 
-#define YLOG_DEFAULT_LEVEL (YLOG_FATAL | YLOG_ERRNO | YLOG_LOG | YLOG_WARN)
+#define YLOG_DEFAULT_LEVEL \
+    (YLOG_FATAL | YLOG_ERRNO | YLOG_LOG | YLOG_WARN | YLOG_FLUSH)
+/* not having flush here confuses Solaris users, who won't see any logs until
+ * (and if) the program exits normally */
 
 #define YLOG_LAST_BIT YLOG_LOGLVL /* the last bit used for regular log bits */
                                 /* the rest are for dynamic modules */
@@ -170,6 +138,39 @@ YAZ_EXPORT void log_event_end(void (*func)(int level, const char *msg, void *inf
 
 YAZ_EXPORT void yaz_log_reopen(void);
 
+#if YAZ_USE_NEW_LOG
+
+#else
+
+#include <yaz/xmalloc.h>
+
+/* The old LOG_ bit names are here for compatibility only. They may 
+ * conflict with bits defined in syslog.h, or other places. 'LOG'
+ * really is not such a good name. YLOG must be more unique
+ */
+#define LOG_FATAL  YLOG_FATAL
+#define LOG_DEBUG  YLOG_DEBUG
+#define LOG_WARN   YLOG_WARN
+#define LOG_LOG    YLOG_LOG /* Deprecated, use the modern dynamic log levels*/
+#define LOG_ERRNO  YLOG_ERRNO 
+#define LOG_FILE   0x00000020 /* Deprecated - no YLOG_ equivalent */
+#define LOG_APP    0x00000040 /* Deprecated - no YLOG_ equivalent */
+#define LOG_MALLOC YLOG_MALLOC /* deprecated */
+#define LOG_NOTIME YLOG_NOTIME /* do not output date and time */
+#define LOG_APP2   0x00000200 /* Deprecated - no YLOG_ equivalent */
+#define LOG_APP3   0x00000400 /* Deprecated - no YLOG_ equivalent */
+#define LOG_FLUSH  YLOG_FLUSH 
+
+#define LOG_ALL    YLOG_ALL
+
+#define LOG_DEFAULT_LEVEL YLOG_DEFAULT_LEVEL
+
+
+/* logf is deprecated, as it conflicts with a math function */
+#define logf yaz_log
+
+#endif /* if YAZ_USE_NEW_LOG */
+
 YAZ_END_CDECL
 
 #endif