X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=include%2Fcharmap.h;h=fb189a1b01ca2939d3f2521be6aaa85ebbd038f4;hb=d310ea540d84722bcda486995c29b4dd2b08cb61;hp=6001b7ae495e012b14fd09fd8d9f2266ef203181;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git

diff --git a/include/charmap.h b/include/charmap.h
index 6001b7a..fb189a1 100644
--- a/include/charmap.h
+++ b/include/charmap.h
@@ -1,6 +1,6 @@
-/* $Id: charmap.h,v 1.8 2002-08-02 19:26:55 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: charmap.h,v 1.9.2.3 2006-08-14 10:38:55 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -15,9 +15,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 Zebra; see the file LICENSE.zebra.  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
+
 */
 
 
@@ -27,12 +27,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <yaz/yconfig.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+YAZ_BEGIN_CDECL
 
 YAZ_EXPORT extern const char *CHR_UNKNOWN;
 YAZ_EXPORT extern const char *CHR_SPACE;
+YAZ_EXPORT extern const char *CHR_CUT;
 YAZ_EXPORT extern const char *CHR_BASE;
 
 struct chr_t_entry;
@@ -44,19 +43,16 @@ YAZ_EXPORT chrmaptab chrmaptab_create(const char *tabpath, const char *name,
 				      int map_only, const char *tabroot);
 YAZ_EXPORT void chrmaptab_destroy (chrmaptab tab);
 
-YAZ_EXPORT const char **chr_map_input(chrmaptab t, const char **from, int len);
+YAZ_EXPORT const char **chr_map_input(chrmaptab t, const char **from, int len, int first);
 YAZ_EXPORT const char **chr_map_input_x(chrmaptab t,
-					const char **from, int *len);
-YAZ_EXPORT const char **chr_map_input_q(chrmaptab maptab,
-					const char **from, int len,
-					const char **qmap);
+					const char **from, int *len, int first);
+YAZ_EXPORT const char **chr_map_q_input(chrmaptab maptab,
+					const char **from, int len, int first);
     
 YAZ_EXPORT const char *chr_map_output(chrmaptab t, const char **from, int len);
 
 YAZ_EXPORT unsigned char zebra_prim(char **s);
 
-#ifdef __cplusplus
-}
-#endif
+YAZ_END_CDECL
 
 #endif