Fixed warnings. Updated headers

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

diff --git a/include/yaz/yaz-ccl.h b/include/yaz/yaz-ccl.h
index 2ef4fb9..0f8fb9c 100644 (file)
--- a/include/yaz/yaz-ccl.h
+++ b/include/yaz/yaz-ccl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-2003, Index Data.
  *
  * 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,30 +23,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Log: yaz-ccl.h,v $
- * Revision 1.1  1999-11-30 13:47:11  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.8  1997/09/01 08:49:54  adam
- * New windows NT/95 port using MSV5.0. To export DLL functions the
- * YAZ_EXPORT modifier was added. Defined in yconfig.h.
- *
- * Revision 1.7  1997/06/23 10:30:45  adam
- * Added ODR stream as parameter to ccl_rpn_query and ccl_scan_query.
- *
- * Revision 1.6  1997/05/14 06:53:54  adam
- * C++ support.
- *
- * Revision 1.5  1995/09/29 17:12:14  quinn
- * Smallish
- *
- * Revision 1.4  1995/09/27  15:02:54  quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.3  1995/05/16  08:50:40  quinn
- * License, documentation, and memory fixes
- *
- *
+ * $Id: yaz-ccl.h,v 1.5 2003-03-03 19:57:35 adam Exp $
  */
 
 #ifndef YAZ_CCL_H
@@ -56,16 +33,14 @@
 #include <yaz/proto.h>
 #include <yaz/ccl.h>
 #include <yaz/odr.h>
+#include <yaz/wrbuf.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+YAZ_BEGIN_CDECL
 
 YAZ_EXPORT Z_RPNQuery *ccl_rpn_query (ODR o, struct ccl_rpn_node *p);
 YAZ_EXPORT Z_AttributesPlusTerm *ccl_scan_query (ODR o, struct ccl_rpn_node *p);
+YAZ_EXPORT void ccl_pquery (WRBUF w, struct ccl_rpn_node *p);
 
-#ifdef __cplusplus
-}
-#endif
+YAZ_END_CDECL
 
 #endif