X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Flog.h;h=017a5bb1045eee8965ee14138da73b45b329cd83;hp=3005ef1560dee459aa75c8457c9056382132fe3d;hb=14f4eaaffa771604e1cbb54edc51d6f213a3e30c;hpb=95dfab01523e56dd46cba0dde323c9dd24585a48

diff --git a/include/yaz/log.h b/include/yaz/log.h
index 3005ef1..017a5bb 100644
--- a/include/yaz/log.h
+++ b/include/yaz/log.h
@@ -23,7 +23,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: log.h,v 1.21 2004-11-19 09:59:31 heikki Exp $
+ * $Id: log.h,v 1.23 2004-11-26 10:58:38 heikki Exp $
  */
 
 /**
@@ -52,20 +52,23 @@ YAZ_BEGIN_CDECL
 #define LOG_WARN   YLOG_WARN
 #define LOG_LOG    YLOG_LOG /* Deprecated, use the modern dynamic log levels*/
 #define LOG_ERRNO  YLOG_ERRNO 
- /*     LOG_FILE   discontinued */
-#define LOG_APP    YLOG_APP   /* Deprecated */
- /*     LOG_MALLOC discontinued */
+#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   YLOG_APP2 /* deprecated */
-#define LOG_APP3   YLOG_APP3 /* deprecated */
+#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 so new that nobody should be using it.  */
+ /*     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
 YAZ_END_CDECL