Check for USEMARCON version

diff --git a/src/proxyp.h b/src/proxyp.h
index 5ffc8e8..96db01e 100644 (file)
--- a/src/proxyp.h
+++ b/src/proxyp.h
@@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #if HAVE_USEMARCON
 #include <usemarconlib.h>
 
 #if HAVE_USEMARCON
 #include <usemarconlib.h>

+#include <defines.h>

 #endif
 
 #include <yazpp/record-cache.h>
 #endif
 
 #include <yazpp/record-cache.h>

diff --git a/src/yaz-usemarcon.cpp b/src/yaz-usemarcon.cpp
index 6b45a03..72dd3dc 100644 (file)
--- a/src/yaz-usemarcon.cpp
+++ b/src/yaz-usemarcon.cpp
@@ -43,7 +43,11 @@ int Yaz_usemarcon::convert(const char *stage1, const char *stage2,
     if (stage1 && *stage1)
     {
         char *converted;
     if (stage1 && *stage1)
     {
         char *converted;

+#if RULE_VERSION >= 314

         size_t convlen;
         size_t convlen;

+#else
+        int convlen;
+#endif

         if (!m_stage1)
         {
             m_stage1 = new Usemarcon();
         if (!m_stage1)
         {
             m_stage1 = new Usemarcon();