Avoid declaration after statement

[idzebra-moved-to-github.git] / include / charmap.h

diff --git a/include/charmap.h b/include/charmap.h
index 6001b7a..ed248e1 100644 (file)
--- 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.14 2005-06-15 21:31:45 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,19 +20,16 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
 #ifndef CHARMAP_H
 #define CHARMAP_H
 
 #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;
@@ -41,22 +38,17 @@ typedef struct chr_t_entry chr_t_entry;
 typedef struct chrmaptab_info *chrmaptab;
 
 YAZ_EXPORT chrmaptab chrmaptab_create(const char *tabpath, const char *name,
-                                     int map_only, const char *tabroot);
+                                     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