X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=isamc%2Fmerge.c;h=e0b7fce8e07602125d8bb00ce7f42f0350572f7b;hp=80ca911efb7c76941b131b7b278cc599021f7717;hb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;hpb=084ad8d210469872bda11c201267a361ca295435

diff --git a/isamc/merge.c b/isamc/merge.c
index 80ca911..e0b7fce 100644
--- a/isamc/merge.c
+++ b/isamc/merge.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: merge.c,v $
- * Revision 1.10  1998-03-19 12:22:09  adam
+ * Revision 1.11  1999-05-26 07:49:14  adam
+ * C++ compilation.
+ *
+ * Revision 1.10  1998/03/19 12:22:09  adam
  * Minor change.
  *
  * Revision 1.9  1998/03/19 10:04:38  adam
@@ -58,7 +61,8 @@ struct isc_merge_block {
     int dirty;        /* block is different from that on file */
 };
 
-static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr, int last)
+static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
+			int last)
 {
     int i, no_dirty = 0;
     for (i = 0; i<ptr; i++)