Version 1.3.6

[yazproxy-moved-to-github.git] / src / yaz-usemarcon.cpp

diff --git a/src/yaz-usemarcon.cpp b/src/yaz-usemarcon.cpp
index a815f7b..8d8c715 100644 (file)
--- a/src/yaz-usemarcon.cpp
+++ b/src/yaz-usemarcon.cpp
@@ -1,7 +1,5 @@
-/* $Id: yaz-usemarcon.cpp,v 1.3 2006-03-30 10:31:37 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   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
@@ -14,10 +12,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include <yaz/log.h>
 #include "proxyp.h"
@@ -46,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();
@@ -92,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