From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 10 Feb 2011 09:20:46 +0000 (+0100)
Subject: Check for USEMARCON version
X-Git-Tag: v1.3.6~5
X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=commitdiff_plain;h=c55cfc080af8a6fea00ed51c7bb88af80e203107

Check for USEMARCON version
---

diff --git a/src/proxyp.h b/src/proxyp.h
index 5ffc8e8..96db01e 100644
--- 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>
+#include <defines.h>
 #endif
 
 #include <yazpp/record-cache.h>
diff --git a/src/yaz-usemarcon.cpp b/src/yaz-usemarcon.cpp
index 6b45a03..72dd3dc 100644
--- 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 RULE_VERSION >= 314
         size_t convlen;
+#else
+        int convlen;
+#endif
         if (!m_stage1)
         {
             m_stage1 = new Usemarcon();