X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isams%2Fisams.c;h=9ddc0f03243f230b2d8ae846dc919fd71330cf85;hb=a163e5642ee63cbc14ab2d44eadeb15ed167eaed;hp=08d0b0fb7856396f9dfdaad52451cd26e005e401;hpb=0e56fa84bb4a5985c19a21926e86862c08d84689;p=idzebra-moved-to-github.git

diff --git a/isams/isams.c b/isams/isams.c
index 08d0b0f..9ddc0f0 100644
--- a/isams/isams.c
+++ b/isams/isams.c
@@ -1,6 +1,6 @@
-/* $Id: isams.c,v 1.9 2004-12-08 14:02:37 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: isams.c,v 1.12 2005-04-13 13:03:48 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -26,7 +26,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <string.h>
 #include <stdio.h>
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
 #include <idzebra/isams.h>
 
 typedef struct {
@@ -111,7 +112,7 @@ int isams_close (ISAMS is)
     return 0;
 }
 
-ISAMS_P isams_merge (ISAMS is, ISAMS_I data)
+ISAM_P isams_merge (ISAMS is, ISAMS_I data)
 {
     char i_item[128];
     int i_more, i_mode;
@@ -183,7 +184,7 @@ ISAMS_P isams_merge (ISAMS is, ISAMS_I data)
     return first_block * is->block_size + first_offset;
 }
 
-ISAMS_PP isams_pp_open (ISAMS is, ISAMS_P pos)
+ISAMS_PP isams_pp_open (ISAMS is, ISAM_P pos)
 {
     ISAMS_PP pp = (ISAMS_PP) xmalloc (sizeof(*pp));