X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-usemarcon.cpp;h=8d8c7150163c9fe662876aec577c13826d0ec494;hp=6ac46b81bea6a849c850e630ccf2861633556ad7;hb=82b0575e71269b113acb2bb7c7541a470ed07c9a;hpb=7b429cd9f6320f71b949f7e90270266b2f617c07

diff --git a/src/yaz-usemarcon.cpp b/src/yaz-usemarcon.cpp
index 6ac46b8..8d8c715 100644
--- a/src/yaz-usemarcon.cpp
+++ b/src/yaz-usemarcon.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -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();
@@ -89,6 +93,7 @@ int Yaz_usemarcon::convert(const char *stage1, const char *stage2,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab