X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftest_odr.c;h=65e2ed154f867725f6c5aba28d157c64648bbc67;hp=5865f0acb74b981d424f24720258055f535be0eb;hb=69b1d8e7b437179163fe97b7cbead51a56835f2a;hpb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35

diff --git a/test/test_odr.c b/test/test_odr.c
index 5865f0a..65e2ed1 100644
--- a/test/test_odr.c
+++ b/test/test_odr.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
  */
 #if HAVE_CONFIG_H
@@ -25,20 +25,22 @@ void tst_MySequence1(ODR encode, ODR decode)
     YAZ_CHECK(s);
     s->first = odr_intdup(encode, 12345);
     s->second = (Odr_oct *) odr_malloc(encode, sizeof(*s->second));
-    s->second->buf = (unsigned char *) "hello";
+    s->second->buf = (char *) "hello";
     s->second->len = 5;
+#if OCT_SIZE
     s->second->size = 0;
+#endif
     s->third = odr_booldup(encode, 1);
     s->fourth = odr_nullval();
     s->fifth = odr_intdup(encode, YC_MySequence_enum1);
-    
+
     s->myoid = odr_getoidbystr(decode, MYOID);
 
     ret = yc_MySequence(encode, &s, 0, 0);
     YAZ_CHECK(ret);
     if (!ret)
         return;
-    
+
     ber_buf = odr_getbuf(encode, &ber_len, 0);
 
     odr_setbuf(decode, ber_buf, ber_len, 0);
@@ -80,9 +82,11 @@ void tst_MySequence2(ODR encode, ODR decode)
     YAZ_CHECK(s);
     s->first = 0;  /* deliberately miss this .. */
     s->second = (Odr_oct *) odr_malloc(encode, sizeof(*s->second));
-    s->second->buf = (unsigned char *) "hello";
+    s->second->buf = (char *) "hello";
     s->second->len = 5;
+#if OCT_SIZE
     s->second->size = 0;
+#endif
     s->third = odr_booldup(encode, 1);
     s->fourth = odr_nullval();
     s->fifth = odr_intdup(encode, YC_MySequence_enum1);
@@ -130,7 +134,7 @@ static void tst_berint32(ODR encode, ODR decode)
     Odr_int val;
     Odr_int ret_val;
     int r;
-    
+
     val = 0;
     odr_reset(encode);
     r = ber_integer(encode, &val);
@@ -253,7 +257,7 @@ static void tst_berint64(ODR encode, ODR decode)
     Odr_int val;
     Odr_int ret_val;
     int r;
-    
+
     val = (Odr_int) 2 * 2147483648UL; /* 2^32 */
     odr_reset(encode);
     r = ber_integer(encode, &val);
@@ -340,7 +344,7 @@ void do_nothing_useful(Odr_int value)
     Odr_int *valp, *resvalp;
     char *bufferp;
     int len;
-     
+
     /* allocate streams */
     if (!(encode = odr_createmem(ODR_ENCODE)))
         return;