X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fber_oct.c;h=e7c91a865cd60c24e76b888f06212270a308c13a;hp=ee45789e2ebda60b80a7ed827df35cc25f0d5f41;hb=044d170f0a963555486df54653cd2fdc5815928b;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4

diff --git a/odr/ber_oct.c b/odr/ber_oct.c
index ee45789..e7c91a8 100644
--- a/odr/ber_oct.c
+++ b/odr/ber_oct.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_oct.c,v $
- * Revision 1.9  1995-09-27 15:02:55  quinn
+ * Revision 1.11  1998-02-11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.10  1995/09/29 17:12:18  quinn
+ * Smallish
+ *
+ * Revision 1.9  1995/09/27  15:02:55  quinn
  * Modified function heads & prototypes.
  *
  * Revision 1.8  1995/05/16  08:50:47  quinn
@@ -36,7 +42,7 @@
 
 #include <odr.h>
 
-int MDF ber_octetstring(ODR o, Odr_oct *p, int cons)
+int ber_octetstring(ODR o, Odr_oct *p, int cons)
 {
     int res, len;
     unsigned char *base, *c;
@@ -67,7 +73,7 @@ int MDF ber_octetstring(ODR o, Odr_oct *p, int cons)
 	    }
 	    if (len + 1 > p->size - p->len)
 	    {
-	    	c = odr_malloc(o, p->size += len + 1);
+	    	c = (unsigned char *)odr_malloc(o, p->size += len + 1);
 	    	if (p->len)
 		    memcpy(c, p->buf, p->len);
 		p->buf = c;