Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

diff --git a/doc/odr.xml b/doc/odr.xml
index 0f6ac6f..230dcd1 100644 (file)
--- a/doc/odr.xml
+++ b/doc/odr.xml
@@ -308,7 +308,7 @@
       informative operation.
      </para>
      <programlisting><![CDATA[
-void do_nothing_useful(int value)
+void do_nothing_useful(Odr_int value)
 {
     ODR encode, decode;
     Odr_int *valp, *resvalp;

diff --git a/src/odr_bool.c b/src/odr_bool.c
index 0434183..a287aaa 100644 (file)
--- a/src/odr_bool.c
+++ b/src/odr_bool.c
@@ -18,7 +18,7 @@
  * Top level boolean en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_bool(ODR o, Odr_int **p, int opt, const char *name)
+int odr_bool(ODR o, Odr_bool **p, int opt, const char *name)
 {
     int res, cons = 0;
 

diff --git a/test/tstodr.c b/test/tstodr.c
index f2b8b3a..a16251b 100644 (file)
--- a/test/tstodr.c
+++ b/test/tstodr.c
@@ -137,7 +137,7 @@ static void tst(void)
 }
 
 /* example from documentation.. 'Using Odr' */
-void do_nothing_useful(int value)
+void do_nothing_useful(Odr_int value)
 {
     ODR encode, decode;
     Odr_int *valp, *resvalp;