Moved definitions of nmem_block and nmem_control.

diff --git a/include/nmem.h b/include/nmem.h
index 5e0a521..5d46548 100644 (file)
--- a/include/nmem.h
+++ b/include/nmem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
@@ -33,6 +33,21 @@
 extern "C" {
 #endif
 
+typedef struct nmem_block
+{
+    char *buf;              /* memory allocated in this block */
+    int size;               /* size of buf */
+    int top;                /* top of buffer */
+    struct nmem_block *next;
+} nmem_block;
+
+typedef struct nmem_control
+{
+    int total;
+    nmem_block *blocks;
+    struct nmem_control *next;
+} nmem_control;
+
 typedef struct nmem_control *NMEM;
 
 void nmem_reset(NMEM n);

diff --git a/include/odr.h b/include/odr.h
index 4bf13b3..7e86126 100644 (file)
--- a/include/odr.h
+++ b/include/odr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: odr.h,v $
- * Revision 1.21  1997-05-14 06:53:41  adam
+ * Revision 1.22  1997-07-21 12:44:30  adam
+ * Moved definitions of nmem_block and nmem_control.
+ *
+ * Revision 1.21  1997/05/14 06:53:41  adam
  * C++ support.
  *
  * Revision 1.20  1997/04/30 08:52:08  quinn
@@ -229,9 +232,6 @@ typedef struct odr_constack
     int lenlen;                  /* length of length-field */
 } odr_constack;
 
-struct odr_memblock; /* defined in odr_mem.c */
-typedef struct odr_memblock *ODR_MEM;
-
 #define ODR_S_SET     0
 #define ODR_S_CUR     1
 #define ODR_S_END     2