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

available innewer software using ylog.h. It conflicted with a
math function

diff --git a/include/yaz/log.h b/include/yaz/log.h
index 3005ef1..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.21 2004-11-19 09:59:31 heikki Exp $
+ * $Id: log.h,v 1.22 2004-11-19 10:07:08 heikki Exp $
  */
 
 /**
@@ -66,6 +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

diff --git a/include/yaz/ylog.h b/include/yaz/ylog.h
index d950c83..b6dcf6b 100644 (file)
--- a/include/yaz/ylog.h
+++ b/include/yaz/ylog.h
@@ -23,7 +23,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: ylog.h,v 1.2 2004-11-19 09:59:31 heikki Exp $
+ * $Id: ylog.h,v 1.3 2004-11-19 10:07:08 heikki Exp $
  */
 
 /**
@@ -65,7 +65,6 @@ YAZ_BEGIN_CDECL
 #define YLOG_LAST_BIT YLOG_LOGLVL /* the last bit used for regular log bits */
                                 /* the rest are for dynamic modules */
 
-#define logf yaz_log
 
 /** 
  * yaz_log_init is a shorthand for initializing the log level and prefixes */