X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr.c;h=3208e7a80ec189d0921cd2f148126b8064d8ded7;hb=475b8ce3047108dcf7a87251733299077d7001e7;hp=efded18c79047b6951736a557da57a38c146065e;hpb=068a5a7412f492019b4d6f5e89158098d44368f7;p=yaz-moved-to-github.git

diff --git a/odr/odr.c b/odr/odr.c
index efded18..3208e7a 100644
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr.c,v $
- * Revision 1.25  1997-10-31 12:20:08  adam
+ * Revision 1.27  1998-02-11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.26  1997/11/24 11:33:56  adam
+ * Using function odr_nullval() instead of global ODR_NULLVAL when
+ * appropriate.
+ *
+ * Revision 1.25  1997/10/31 12:20:08  adam
  * Improved memory debugging for xmalloc/nmem.c. References to NMEM
  * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
  * Bug fix: missing fclose in data1_read_espec1.
@@ -96,6 +103,11 @@
 
 Odr_null *ODR_NULLVAL = "NULL";  /* the presence of a null value */
 
+Odr_null *odr_nullval (void)
+{
+    return ODR_NULLVAL;
+}
+
 char *odr_errlist[] =
 {
     "No (unknown) error",
@@ -136,11 +148,11 @@ void odr_setprint(ODR o, FILE *file)
 
 ODR odr_createmem(int direction)
 {
-    struct odr *r;
+    ODR r;
 
 
     logf (LOG_DEBUG, "odr_createmem dir=%d", direction);
-    if (!(r = xmalloc(sizeof(*r))))
+    if (!(r = (ODR)xmalloc(sizeof(*r))))
         return 0;
     r->direction = direction;
     r->print = stderr;