X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=include%2Fisamc.h;h=0dc73ec59658ccc8a59ac11414072291fa41adde;hp=61ba2d2fc5d14b119f77b6332d7437d0d9f64847;hb=2e4e9c6def27f1e1463dcb6f205fab6a98054f38;hpb=367b31a1c65ab68ded2db67d9922bf4b36cd5453

diff --git a/include/isamc.h b/include/isamc.h
index 61ba2d2..0dc73ec 100644
--- a/include/isamc.h
+++ b/include/isamc.h
@@ -1,4 +1,4 @@
-/* $Id: isamc.h,v 1.12 2004-06-01 12:56:38 adam Exp $
+/* $Id: isamc.h,v 1.13 2004-08-04 08:35:23 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -20,19 +20,16 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
 #ifndef ISAMC_H
 #define ISAMC_H
 
+#include <isam-codec.h>
 #include <bfile.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+YAZ_BEGIN_CDECL
 
 typedef struct ISAMC_s *ISAMC;
-typedef int ISAMC_P;
+typedef zint ISAMC_P;
 typedef struct ISAMC_PP_s *ISAMC_PP;
 
 typedef struct ISAMC_filecat_s {
@@ -48,12 +45,7 @@ typedef struct ISAMC_M_s {
     int (*compare_item)(const void *a, const void *b);
     void (*log_item)(int logmask, const void *p, const char *txt);
 
-#define ISAMC_DECODE 0
-#define ISAMC_ENCODE 1
-    void *(*code_start)(int mode);
-    void (*code_stop)(int mode, void *p);
-    void (*code_item)(int mode, void *p, char **dst, char **src);
-    void (*code_reset)(void *p);
+    ISAM_CODEC codec;
 
     int max_blocks_mem;
     int debug;
@@ -74,16 +66,14 @@ ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P pos);
 void isc_pp_close (ISAMC_PP pp);
 int isc_read_item (ISAMC_PP pp, char **dst);
 int isc_pp_read (ISAMC_PP pp, void *buf);
-int isc_pp_num (ISAMC_PP pp);
+zint isc_pp_num (ISAMC_PP pp);
 
-int isc_block_used (ISAMC is, int type);
+zint isc_block_used (ISAMC is, int type);
 int isc_block_size (ISAMC is, int type);
 
 #define isc_type(x) ((x) & 7)
 #define isc_block(x) ((x) >> 3)
 
-#ifdef __cplusplus
-}
-#endif
+YAZ_END_CDECL
 
 #endif