Deprecated yaz-util.h with a warinng in place. Re-enabled the warning in log.h

[yaz-moved-to-github.git] / include / yaz / log.h

diff --git a/include/yaz/log.h b/include/yaz/log.h
index 3005ef1..fb4561f 100644 (file)
--- 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.27 2004-12-10 10:42:33 heikki Exp $
  */
 
 /**
@@ -35,11 +35,13 @@
 #define LOG_H
 
 #include <yaz/ylog.h>
-#warning "use of log.h is deprecated, use ylog.h instead"
 
-#include <stdio.h>
-#include <yaz/yconfig.h>
-#include <yaz/xmalloc.h>
+#ifndef YAZ_USE_OLD_LOG
+#warning "use of log.h is deprecated, use ylog.h instead" 
+/* if this warning gets on your nerves, run configure like this:
+ * CFLAGS="-Wall -g -D YAZ_USE_OLD_LOG" ./configure
+ */
+#endif
 
 YAZ_BEGIN_CDECL
 
@@ -52,20 +54,24 @@ 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
+
+#endif