X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fyaz-util.h;h=16b25fbf85b81b7cdedca05d10fefd477c93c662;hb=37287b6049ca23d7fa8e84f532eefa7e35f66520;hp=aba53c0569a08658421f63ecbc42e3c7fb4d8978;hpb=769837bc0ae28324b0a793549e1a20036e42e2e5;p=yaz-moved-to-github.git

diff --git a/include/yaz/yaz-util.h b/include/yaz/yaz-util.h
index aba53c0..16b25fb 100644
--- a/include/yaz/yaz-util.h
+++ b/include/yaz/yaz-util.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: yaz-util.h,v 1.13 2004-12-10 10:42:33 heikki Exp $
+ * $Id: yaz-util.h,v 1.16 2005-06-25 15:46:03 adam Exp $
  */
 /**
  * \file yaz-util.h
@@ -37,22 +37,7 @@
 #include <yaz/yaz-version.h>
 #include <yaz/xmalloc.h>
 
-/* [y]log.h trickery */
-/* if [y]log.h has been included, do not worry about it */
-/* else warn here, and make sure log.h does not warn */
-
-#ifndef YLOG_H 
-
-#ifndef YAZ_USE_OLD_LOG
-#warning "yaz-util.h is deprecated - include the files directly, and use ylog.h"
-/* If you get tired of this message, configure your program like this */
-/* CFLAGS="-Wall -g -D YAZ_USE_OLD_LOG" ./configure   */
-#define YAZ_USE_OLD_LOG
-/* do not complain of the old log.h */
-#endif
-
 #include <yaz/log.h>  
-#endif
 
 #include <yaz/tpath.h>
 #include <yaz/options.h>
@@ -63,3 +48,11 @@
 #include <yaz/yaz-iconv.h>
 
 #endif
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+