X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_use.c;h=324bc7d613a1f0074dc3d40d06b1c6f32d4d97c2;hb=475b8ce3047108dcf7a87251733299077d7001e7;hp=bf6a55a673c6b53b27e1141034247de8eb6969e9;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4;p=yaz-moved-to-github.git

diff --git a/odr/odr_use.c b/odr/odr_use.c
index bf6a55a..324bc7d 100644
--- a/odr/odr_use.c
+++ b/odr/odr_use.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_use.c,v $
- * Revision 1.6  1995-09-27 15:03:00  quinn
+ * Revision 1.8  1998-02-11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.7  1995/09/29 17:12:27  quinn
+ * Smallish
+ *
+ * Revision 1.6  1995/09/27  15:03:00  quinn
  * Modified function heads & prototypes.
  *
  * Revision 1.5  1995/08/10  08:54:47  quinn
@@ -27,14 +33,14 @@
 #include <odr.h>
 #include <odr_use.h>
 
-int MDF odr_external(ODR o, Odr_external **p, int opt)
+int odr_external(ODR o, Odr_external **p, int opt)
 {
     Odr_external *pp;
     static Odr_arm arm[] =
     {
-    	{ODR_EXPLICIT, ODR_CONTEXT, 0, ODR_EXTERNAL_single, odr_any},
-    	{ODR_IMPLICIT, ODR_CONTEXT, 1, ODR_EXTERNAL_octet, odr_octetstring},
-    	{ODR_IMPLICIT, ODR_CONTEXT, 2, ODR_EXTERNAL_arbitrary, odr_bitstring},
+    	{ODR_EXPLICIT, ODR_CONTEXT, 0, ODR_EXTERNAL_single, (Odr_fun)odr_any},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 1, ODR_EXTERNAL_octet, (Odr_fun)odr_octetstring},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 2, ODR_EXTERNAL_arbitrary, (Odr_fun)odr_bitstring},
     	{-1, -1, -1, -1, 0}
     };
 
@@ -50,7 +56,7 @@ int MDF odr_external(ODR o, Odr_external **p, int opt)
 	odr_sequence_end(o);
 }
 
-int MDF odr_visiblestring(ODR o, char **p, int opt)
+int odr_visiblestring(ODR o, char **p, int opt)
 {
     return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_VISIBLESTRING,
     	opt);
@@ -60,19 +66,19 @@ int MDF odr_visiblestring(ODR o, char **p, int opt)
  * a char may not be sufficient to hold a general string, but we'll deal
  * with that once we start looking more closely at UniCode & co.
  */
-int MDF odr_generalstring(ODR o, char **p, int opt)
+int odr_generalstring(ODR o, char **p, int opt)
 {
     return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GENERALSTRING,
     	opt);
 }    
 
-int MDF odr_graphicstring(ODR o, char **p, int opt)
+int odr_graphicstring(ODR o, char **p, int opt)
 {
     return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GRAPHICSTRING,
     	opt);
 }    
 
-int MDF odr_generalizedtime(ODR o, char **p, int opt)
+int odr_generalizedtime(ODR o, char **p, int opt)
 {
     return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GENERALIZEDTIME,
     	opt);