Moved the #define of logf back into log.h, so that it won't be

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

diff --git a/include/yaz/log.h b/include/yaz/log.h
index a7bd8bf..578de2f 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.20 2004-11-18 15:18:13 heikki Exp $
+ * $Id: log.h,v 1.22 2004-11-19 10:07:08 heikki Exp $
  */
 
 /**
@@ -35,7 +35,7 @@
 #define LOG_H
 
 #include <yaz/ylog.h>
-#warning "use of log.h is deprecated, use logf.h instead"
+#warning "use of log.h is deprecated, use ylog.h instead"
 
 #include <stdio.h>
 #include <yaz/yconfig.h>
@@ -66,5 +66,8 @@ YAZ_BEGIN_CDECL
 #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