X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=isamc%2Fmerge.c;fp=isamc%2Fmerge.c;h=7bfdf05dbcd3c29aed6891808d716b4c215b10d3;hp=15fa89aab2968e54d872da957c1b109e406efa0f;hb=ae2d0647bd3a555df77397b6c2f9c129fda0733a;hpb=dbd6f3a01791401472b07250bf35dcbc3ead4f92

diff --git a/isamc/merge.c b/isamc/merge.c
index 15fa89a..7bfdf05 100644
--- a/isamc/merge.c
+++ b/isamc/merge.c
@@ -1,4 +1,4 @@
-/* $Id: merge.c,v 1.22 2003-03-05 16:41:10 adam Exp $
+/* $Id: merge.c,v 1.23 2003-06-23 15:36:11 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -154,7 +154,7 @@ static int get_border (ISAMC is, struct isc_merge_block *mb, int ptr,
     return mb[ptr].offset + fill - off;
 }
 
-ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data)
+ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data)
 {
 
     char i_item[128], *i_item_ptr;
@@ -482,7 +482,10 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data)
 
 /*
  * $Log: merge.c,v $
- * Revision 1.22  2003-03-05 16:41:10  adam
+ * Revision 1.23  2003-06-23 15:36:11  adam
+ * Implemented isamb_unlink.
+ *
+ * Revision 1.22  2003/03/05 16:41:10  adam
  * Fix GCC warnings
  *
  * Revision 1.21  2002/08/02 19:26:56  adam