** Merged from IBEX_DISK branch to head.

2000-09-19  Not Zed  <NotZed@HelixCode.com>

	** Merged from IBEX_DISK branch to head.

svn path=/trunk/; revision=5500

1 files changed, 5 insertions, 11 deletions

diff --git a/libibex/ibex_internal.h b/libibex/ibex_internal.h
index 1647147a3a..a21867a2ab 100644
--- a/libibex/ibex_internal.h
+++ b/libibex/ibex_internal.h
@@ -21,19 +21,13 @@
 #include <glib.h>
 
 #include "ibex.h"
+#include "block.h"
+#include "wordindex.h"
 
-#define IBEX_VERSION "ibex1"
+#define IBEX_VERSION "ibex3"
 
 struct ibex {
 	char *path;
-	GTree *files;
-	GHashTable *words;
-	GPtrArray *oldfiles;
-	gboolean dirty;
+	struct _memcache *blocks;
+	struct _IBEXWord *words;
 };
-
-struct ibex_file {
-	char *name;
-	long index;
-};
-typedef struct ibex_file ibex_file;