X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fodr.h;h=24a5780008eed420b1c0b5d9c11b777e2bd12d1a;hb=cef1af6f2b0a094a907dec1a7bd1c4f6a42ef13c;hp=7e86126b872d5aaeccc10f2f5785e510010dd0ed;hpb=88d26764ac94b4a2872c77e2deed58b15d2f6f02;p=yaz-moved-to-github.git

diff --git a/include/odr.h b/include/odr.h
index 7e86126..24a5780 100644
--- a/include/odr.h
+++ b/include/odr.h
@@ -24,7 +24,15 @@
  * OF THIS SOFTWARE.
  *
  * $Log: odr.h,v $
- * Revision 1.22  1997-07-21 12:44:30  adam
+ * Revision 1.24  1997-11-24 11:33:56  adam
+ * Using function odr_nullval() instead of global ODR_NULLVAL when
+ * appropriate.
+ *
+ * Revision 1.23  1997/09/01 08:49:49  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * 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
@@ -245,6 +253,12 @@ typedef struct odr_ecblock
     int size;             /* current buffer size */
 } odr_ecblock;
 
+typedef struct {      /* used to be statics in ber_tag... */
+    int lclass;
+    int ltag;
+    int br;
+    int lcons;
+} Odr_ber_tag;
 
 typedef struct odr
 {
@@ -274,6 +288,8 @@ typedef struct odr
 #define ODR_MAX_STACK 50
     int stackp;          /* top of stack (-1 == initial state) */
     odr_constack stack[ODR_MAX_STACK];
+
+    Odr_ber_tag odr_ber_tag;
 } *ODR;
 
 typedef int (*Odr_fun)();
@@ -305,16 +321,17 @@ typedef struct odr_arm
 
 extern char *odr_errlist[];
 
-int odr_geterror(ODR o);
-void odr_perror(ODR o, char *message);
-void odr_setprint(ODR o, FILE *file);
-ODR odr_createmem(int direction);
-void odr_reset(ODR o);
-void odr_destroy(ODR o);
-void odr_setbuf(ODR o, char *buf, int len, int can_grow);
-char *odr_getbuf(ODR o, int *len, int *size);
-void *odr_malloc(ODR o, int size);
-NMEM odr_extract_mem(ODR o);
+YAZ_EXPORT int odr_geterror(ODR o);
+YAZ_EXPORT void odr_perror(ODR o, char *message);
+YAZ_EXPORT void odr_setprint(ODR o, FILE *file);
+YAZ_EXPORT ODR odr_createmem(int direction);
+YAZ_EXPORT void odr_reset(ODR o);
+YAZ_EXPORT void odr_destroy(ODR o);
+YAZ_EXPORT void odr_setbuf(ODR o, char *buf, int len, int can_grow);
+YAZ_EXPORT char *odr_getbuf(ODR o, int *len, int *size);
+YAZ_EXPORT void *odr_malloc(ODR o, int size);
+YAZ_EXPORT NMEM odr_extract_mem(ODR o);
+YAZ_EXPORT Odr_null *odr_nullval(void);
 #define odr_release_mem(m) nmem_destroy(m)
 #define ODR_MEM NMEM