From: Sebastian Hammer <quinn@indexdata.com>
Date: Wed, 27 Sep 1995 15:02:33 +0000 (+0000)
Subject: Modified function heads & prototypes.
X-Git-Tag: YAZ.1.8~909
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=657fb99115b87a5244e9a33bbe4ca3d9d18849c4;ds=sidebyside

Modified function heads & prototypes.
---

diff --git a/Makefile b/Makefile
index a491ea6..348b161 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.22 1995-08-28 16:29:45 quinn Exp $
+# $Id: Makefile,v 1.23 1995-09-27 15:02:33 quinn Exp $
 
 # Uncomment the lines below to enable mOSI communcation.
-#ODEFS=-DUSE_XTIMOSI
-#RFC1006=rfc1006
-#LIBMOSI=../../xtimosi/src/libmosi.a ../lib/librfc.a
-#XMOSI=xmosi.o
+ODEFS=-DUSE_XTIMOSI
+RFC1006=rfc1006
+LIBMOSI=../../xtimosi/src/libmosi.a ../lib/librfc.a
+XMOSI=xmosi.o
 
 CDEFS=$(ODEFS)
 #CC=
diff --git a/asn/diagbib1.c b/asn/diagbib1.c
index a2c7129..3e02d93 100644
--- a/asn/diagbib1.c
+++ b/asn/diagbib1.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: diagbib1.c,v $
- * Revision 1.2  1995-05-16 08:50:21  quinn
+ * Revision 1.3  1995-09-27 15:02:39  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.2  1995/05/16  08:50:21  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.1  1995/03/15  13:46:09  adam
@@ -91,7 +94,7 @@ struct {
 { 0, NULL} 
 };
 
-const char *diagbib1_str (int code)
+const char MDF *diagbib1_str (int code)
 {
     int i;
     for (i=0; msg_tab[i].msg; i++)
diff --git a/asn/proto.c b/asn/proto.c
index b50e132..c309e7b 100644
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.37  1995-08-21 09:10:15  quinn
+ * Revision 1.38  1995-09-27 15:02:40  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.37  1995/08/21  09:10:15  quinn
  * Smallish fixes to suppport new formats.
  *
  * Revision 1.36  1995/08/15  11:59:39  quinn
@@ -127,7 +130,7 @@
  * We'll use a general octetstring here, since string operations are
  * clumsy on long strings.
  */
-int z_SUTRS(ODR o, Odr_oct **p, int opt)
+int MDF z_SUTRS(ODR o, Odr_oct **p, int opt)
 {
     return odr_implicit(o, odr_octetstring, p, ODR_UNIVERSAL,
 	ODR_GENERALSTRING, opt);
@@ -138,7 +141,7 @@ int z_ReferenceId(ODR o, Z_ReferenceId **p, int opt)
     return odr_implicit(o, odr_octetstring, (Odr_oct**) p, ODR_CONTEXT, 2, opt);
 }
 
-int z_DatabaseName(ODR o, Z_DatabaseName **p, int opt)
+int MDF z_DatabaseName(ODR o, Z_DatabaseName **p, int opt)
 {
     return odr_implicit(o, odr_visiblestring, (char **) p, ODR_CONTEXT, 105,
 	opt);
@@ -150,7 +153,7 @@ int z_ResultSetId(ODR o, char **p, int opt)
 	opt);
 }
 
-int z_ElementSetName(ODR o, char **p, int opt)
+int MDF z_ElementSetName(ODR o, char **p, int opt)
 {
     return odr_implicit(o, odr_visiblestring, p, ODR_CONTEXT, 103, opt);
 }
@@ -161,7 +164,7 @@ int z_UserInformationField(ODR o, Z_External **p, int opt)
     	11, opt);
 }
 
-int z_InternationalString(ODR o, char **p, int opt)
+int MDF z_InternationalString(ODR o, char **p, int opt)
 {
     return odr_generalstring(o, p, opt);
 }
@@ -176,7 +179,7 @@ int z_InfoCategory(ODR o, Z_InfoCategory **p, int opt)
 	odr_sequence_end(o);
 }
 
-int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt)
+int MDF z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt)
 {
     static Odr_arm arm[] =
     {
@@ -198,7 +201,7 @@ int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt)
 	odr_sequence_end(o);
 }
     
-int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt)
+int MDF z_OtherInformation(ODR o, Z_OtherInformation **p, int opt)
 {
     if (o->direction == ODR_DECODE)
     	*p = odr_malloc(o, sizeof(**p));
@@ -212,7 +215,7 @@ int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt)
     return opt && odr_ok(o);
 }
 
-int z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt)
+int MDF z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt)
 {
     static Odr_arm arm[] =
     {
@@ -236,7 +239,7 @@ int z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt)
 /*
  * check tagging!!
  */
-int z_Unit(ODR o, Z_Unit **p, int opt)
+int MDF z_Unit(ODR o, Z_Unit **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
     	return opt && odr_ok(o);
@@ -250,7 +253,7 @@ int z_Unit(ODR o, Z_Unit **p, int opt)
 	odr_sequence_end(o);
 }
 
-int z_IntUnit(ODR o, Z_IntUnit **p, int opt)
+int MDF z_IntUnit(ODR o, Z_IntUnit **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
     	return opt && odr_ok(o);
@@ -263,7 +266,7 @@ int z_IntUnit(ODR o, Z_IntUnit **p, int opt)
 /* ---------------------- INITIALIZE SERVICE ------------------- */
 
 #if 0
-int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
+int MDF z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
     	return opt && odr_ok(o);
@@ -287,7 +290,7 @@ int z_IdPass(ODR o, Z_IdPass **p, int opt)
     	odr_sequence_end(o);
 }
 
-int z_StrAuthentication(ODR o, char **p, int opt)
+int MDF z_StrAuthentication(ODR o, char **p, int opt)
 {
     return odr_visiblestring(o, p, opt);
 }
@@ -527,7 +530,7 @@ int z_AttributeElement(ODR o, Z_AttributeElement **p, int opt)
     	odr_sequence_end(o);
 }
 
-int z_Term(ODR o, Z_Term **p, int opt)
+int MDF z_Term(ODR o, Z_Term **p, int opt)
 {
     static Odr_arm arm[] =
     {
@@ -755,7 +758,7 @@ int z_DatabaseRecord(ODR o, Z_DatabaseRecord **p, int opt)
 
 #ifdef Z_95
 
-int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt)
+int MDF z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt)
 {
     static Odr_arm arm[] =
     {
@@ -780,7 +783,7 @@ int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt)
     	odr_sequence_end(o);
 }
 
-int z_DiagRec(ODR o, Z_DiagRec **p, int opt)
+int MDF z_DiagRec(ODR o, Z_DiagRec **p, int opt)
 {
     static Odr_arm arm[] = 
     {
@@ -939,7 +942,7 @@ int z_AccessControlResponse(ODR o, Z_AccessControlResponse **p, int opt)
 
 /* ------------------------ SCAN SERVICE -------------------- */
 
-int z_AttributeList(ODR o, Z_AttributeList **p, int opt)
+int MDF z_AttributeList(ODR o, Z_AttributeList **p, int opt)
 {
     if (o->direction == ODR_DECODE)
     	*p = odr_malloc(o, sizeof(**p));
@@ -1195,7 +1198,7 @@ int z_ElementSpec(ODR o, Z_ElementSpec **p, int opt)
     return opt && odr_ok(o);
 }
 
-int z_Specification(ODR o, Z_Specification **p, int opt)
+int MDF z_Specification(ODR o, Z_Specification **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
     	return opt && odr_ok(o);
@@ -1420,7 +1423,7 @@ int z_Close(ODR o, Z_Close **p, int opt)
 
 /* ------------------------ APDU ------------------------- */
 
-int z_Permissions(ODR o, Z_Permissions **p, int opt)
+int MDF z_Permissions(ODR o, Z_Permissions **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
         return opt && odr_ok(o);
@@ -1470,7 +1473,7 @@ int z_ExtendedServicesResponse(ODR o, Z_ExtendedServicesResponse **p, int opt)
 
 /* ------------------------ APDU ------------------------- */
 
-int z_APDU(ODR o, Z_APDU **p, int opt)
+int MDF z_APDU(ODR o, Z_APDU **p, int opt)
 {
     static Odr_arm arm[] =
     {
diff --git a/asn/prt-acc.c b/asn/prt-acc.c
index c90554d..ab9bd55 100644
--- a/asn/prt-acc.c
+++ b/asn/prt-acc.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-acc.c,v $
- * Revision 1.3  1995-08-15 11:59:41  quinn
+ * Revision 1.4  1995-09-27 15:02:41  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.3  1995/08/15  11:59:41  quinn
  * Updated External
  *
  * Revision 1.2  1995/06/05  10:52:05  quinn
@@ -153,7 +156,7 @@ int z_Response1(ODR o, Z_Response1 **p, int opt)
     return opt && odr_ok(o);
 }
 
-int z_PromptObject1(ODR o, Z_PromptObject1 **p, int opt)
+int MDF z_PromptObject1(ODR o, Z_PromptObject1 **p, int opt)
 {
     static Odr_arm arm[] =
     {
diff --git a/asn/prt-dia.c b/asn/prt-dia.c
index f0b85fd..f42f81f 100644
--- a/asn/prt-dia.c
+++ b/asn/prt-dia.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-dia.c,v $
- * Revision 1.1  1995-08-29 11:19:31  quinn
+ * Revision 1.2  1995-09-27 15:02:41  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.1  1995/08/29  11:19:31  quinn
  * Added Diagnostic Format
  *
  *
@@ -350,7 +353,7 @@ int z_DiagnosticUnit(ODR o, Z_DiagnosticUnit **p, int opt)
 	odr_sequence_end(o);
 }
 
-int z_DiagnosticFormat(ODR o, Z_DiagnosticFormat **p, int opt)
+int MDF z_DiagnosticFormat(ODR o, Z_DiagnosticFormat **p, int opt)
 {
     if (o->direction == ODR_DECODE)
 	*p = odr_malloc(o, sizeof(**p));
diff --git a/asn/prt-exd.c b/asn/prt-exd.c
index 6ae2989..0508f17 100644
--- a/asn/prt-exd.c
+++ b/asn/prt-exd.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-exd.c,v $
- * Revision 1.1  1995-08-21 09:16:32  quinn
+ * Revision 1.2  1995-09-27 15:02:41  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.1  1995/08/21  09:16:32  quinn
  * Added Extended services + Item Order
  *
  *
@@ -12,7 +15,7 @@
 
 #include <proto.h>
 
-int z_TaskPackage(ODR o, Z_TaskPackage **p, int opt)
+int MDF z_TaskPackage(ODR o, Z_TaskPackage **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
         return opt && odr_ok(o);
@@ -172,7 +175,7 @@ int z_IOTaskPackage(ODR o, Z_IOTaskPackage **p, int opt)
 	odr_sequence_end(o);
 }
 
-int z_ItemOrder(ODR o, Z_ItemOrder **p, int opt)
+int MDF z_ItemOrder(ODR o, Z_ItemOrder **p, int opt)
 {
     static Odr_arm arm[] =
     {
diff --git a/asn/prt-exp.c b/asn/prt-exp.c
index 9249933..f5ce37e 100644
--- a/asn/prt-exp.c
+++ b/asn/prt-exp.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-exp.c,v $
- * Revision 1.2  1995-08-15 11:59:43  quinn
+ * Revision 1.3  1995-09-27 15:02:42  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.2  1995/08/15  11:59:43  quinn
  * Updated External
  *
  * Revision 1.1  1995/08/10  08:54:02  quinn
@@ -92,7 +95,7 @@ int z_UnitType(ODR o, Z_UnitType **p, int opt);
 int z_Units(ODR o, Z_Units **p, int opt);
 int z_CategoryList(ODR o, Z_CategoryList **p, int opt);
 int z_CategoryInfo(ODR o, Z_CategoryInfo **p, int opt);
-int z_ExplainRecord(ODR o, Z_ExplainRecord **p, int opt);
+int MDF z_ExplainRecord(ODR o, Z_ExplainRecord **p, int opt);
 
 int z_LanguageCode(ODR o, char **p, int opt)
 {
@@ -1342,7 +1345,7 @@ int z_CategoryInfo(ODR o, Z_CategoryInfo **p, int opt)
         odr_sequence_end(o);
 }
 
-int z_ExplainRecord(ODR o, Z_ExplainRecord **p, int opt)
+int MDF z_ExplainRecord(ODR o, Z_ExplainRecord **p, int opt)
 {
     static Odr_arm arm[] =
     {
diff --git a/asn/prt-ext.c b/asn/prt-ext.c
index 769a30e..34e9d42 100644
--- a/asn/prt-ext.c
+++ b/asn/prt-ext.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-ext.c,v $
- * Revision 1.4  1995-08-29 11:17:16  quinn
+ * Revision 1.5  1995-09-27 15:02:42  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.4  1995/08/29  11:17:16  quinn
  * *** empty log message ***
  *
  * Revision 1.3  1995/08/21  09:10:18  quinn
@@ -21,9 +24,9 @@
 
 #include <proto.h>
 
-int z_External(ODR o, Z_External **p, int opt)
+int MDF z_External(ODR o, Z_External **p, int opt)
 {
-    oident *oid;
+   oident *oid;
 
     static Odr_arm arm[] =
     {
diff --git a/asn/prt-grs.c b/asn/prt-grs.c
index e421656..a81bafa 100644
--- a/asn/prt-grs.c
+++ b/asn/prt-grs.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-grs.c,v $
- * Revision 1.2  1995-08-28 10:58:58  quinn
+ * Revision 1.3  1995-09-27 15:02:43  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.2  1995/08/28  10:58:58  quinn
  * Added extra choice-entry to data to catch visiblestring.
  *
  * Revision 1.1  1995/08/17  12:47:09  quinn
@@ -15,7 +18,6 @@
 
 #include <proto.h>
 
-int z_GenericRecord(ODR o, Z_GenericRecord **p, int opt);
 int z_TaggedElement(ODR o, Z_TaggedElement **p, int opt);
 int z_ElementData(ODR o, Z_ElementData **p, int opt);
 int z_ElementMetaData(ODR o, Z_ElementMetaData **p, int opt);
@@ -27,7 +29,7 @@ int z_HitVector(ODR o, Z_HitVector **p, int opt);
 int z_Triple(ODR o, Z_Triple **p, int opt);
 int z_Variant(ODR o, Z_Variant **p, int opt);
 
-int z_GenericRecord(ODR o, Z_GenericRecord **p, int opt)
+int MDF z_GenericRecord(ODR o, Z_GenericRecord **p, int opt)
 {
     if (o->direction == ODR_DECODE)
 	*p = odr_malloc(o, sizeof(**p));
diff --git a/asn/prt-rsc.c b/asn/prt-rsc.c
index 5b7eb17..efec5e4 100644
--- a/asn/prt-rsc.c
+++ b/asn/prt-rsc.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-rsc.c,v $
- * Revision 1.3  1995-06-02 09:49:15  quinn
+ * Revision 1.4  1995-09-27 15:02:43  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.3  1995/06/02  09:49:15  quinn
  * Adding access control
  *
  * Revision 1.2  1995/06/01  14:34:53  quinn
@@ -31,7 +34,7 @@ int z_Estimate1(ODR o, Z_Estimate1 **p, int opt)
 	odr_sequence_end(o);
 }
 
-int z_ResourceReport1(ODR o, Z_ResourceReport1 **p, int opt)
+int MDF z_ResourceReport1(ODR o, Z_ResourceReport1 **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
     	return opt && odr_ok(o);
@@ -58,7 +61,7 @@ int z_Estimate2(ODR o, Z_Estimate2 **p, int opt)
 	odr_sequence_end(o);
 }
 
-int z_ResourceReport2(ODR o, Z_ResourceReport2 **p, int opt)
+int MDF z_ResourceReport2(ODR o, Z_ResourceReport2 **p, int opt)
 {
 if (!odr_sequence_begin(o, p, sizeof(**p)))
     return opt && odr_ok(o);
diff --git a/asn/zget.c b/asn/zget.c
index d6dbf65..6dd9673 100644
--- a/asn/zget.c
+++ b/asn/zget.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zget.c,v $
- * Revision 1.7  1995-06-15 07:44:52  quinn
+ * Revision 1.8  1995-09-27 15:02:43  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.7  1995/06/15  07:44:52  quinn
  * Moving to v3.
  *
  * Revision 1.6  1995/06/14  15:26:37  quinn
@@ -30,7 +33,7 @@
 
 #include <proto.h>
 
-Z_InitRequest *zget_InitRequest(ODR o)
+Z_InitRequest MDF *zget_InitRequest(ODR o)
 {
     Z_InitRequest *r = odr_malloc(o, sizeof(*r));
 
@@ -54,7 +57,7 @@ Z_InitRequest *zget_InitRequest(ODR o)
     return r;
 }
 
-Z_InitResponse *zget_InitResponse(ODR o)
+Z_InitResponse MDF *zget_InitResponse(ODR o)
 {
     Z_InitResponse *r = odr_malloc(o, sizeof(*r));
 
@@ -79,7 +82,7 @@ Z_InitResponse *zget_InitResponse(ODR o)
     return r;
 }
 
-Z_SearchRequest *zget_SearchRequest(ODR o)
+Z_SearchRequest MDF *zget_SearchRequest(ODR o)
 {
     Z_SearchRequest *r = odr_malloc(o, sizeof(*r));
 
@@ -106,7 +109,7 @@ Z_SearchRequest *zget_SearchRequest(ODR o)
     return r;
 }
 
-Z_SearchResponse *zget_SearchResponse(ODR o)
+Z_SearchResponse MDF *zget_SearchResponse(ODR o)
 {
     Z_SearchResponse *r = odr_malloc(o, sizeof(*r));
 
@@ -129,7 +132,7 @@ Z_SearchResponse *zget_SearchResponse(ODR o)
     return r;
 }
 
-Z_PresentRequest *zget_PresentRequest(ODR o)
+Z_PresentRequest MDF *zget_PresentRequest(ODR o)
 {
     Z_PresentRequest *r = odr_malloc(o, sizeof(*r));
 
@@ -156,7 +159,7 @@ Z_PresentRequest *zget_PresentRequest(ODR o)
     return r;
 }
 
-Z_PresentResponse *zget_PresentResponse(ODR o)
+Z_PresentResponse MDF *zget_PresentResponse(ODR o)
 {
     Z_PresentResponse *r = odr_malloc(o, sizeof(*r));
 
@@ -174,7 +177,7 @@ Z_PresentResponse *zget_PresentResponse(ODR o)
     return r;
 }
 
-Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o)
+Z_DeleteResultSetRequest MDF *zget_DeleteResultSetRequest(ODR o)
 {
     Z_DeleteResultSetRequest *r = odr_malloc(o, sizeof(*r));
 
@@ -189,7 +192,7 @@ Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o)
     return r;
 }
 
-Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o)
+Z_DeleteResultSetResponse MDF *zget_DeleteResultSetResponse(ODR o)
 {
     Z_DeleteResultSetResponse *r = odr_malloc(o, sizeof(*r));
 
@@ -208,7 +211,7 @@ Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o)
     return r;
 }
 
-Z_ScanRequest *zget_ScanRequest(ODR o)
+Z_ScanRequest MDF *zget_ScanRequest(ODR o)
 {
     Z_ScanRequest *r = odr_malloc(o, sizeof(*r));
 
@@ -227,7 +230,7 @@ Z_ScanRequest *zget_ScanRequest(ODR o)
     return r;
 }
 
-Z_ScanResponse *zget_ScanResponse(ODR o)
+Z_ScanResponse MDF *zget_ScanResponse(ODR o)
 {
     Z_ScanResponse *r = odr_malloc(o, sizeof(*r));
 
@@ -246,7 +249,7 @@ Z_ScanResponse *zget_ScanResponse(ODR o)
     return r;
 }
 
-Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o)
+Z_TriggerResourceControlRequest MDF *zget_TriggerResourceControlRequest(ODR o)
 {
     Z_TriggerResourceControlRequest *r = odr_malloc(o, sizeof(*r));
 
@@ -261,7 +264,7 @@ Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o)
     return r;
 }
 
-Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o)
+Z_ResourceControlRequest MDF *zget_ResourceControlRequest(ODR o)
 {
     Z_ResourceControlRequest *r = odr_malloc(o, sizeof(*r));
 
@@ -278,7 +281,7 @@ Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o)
     return r;
 }
 
-Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o)
+Z_ResourceControlResponse MDF *zget_ResourceControlResponse(ODR o)
 {
     Z_ResourceControlResponse *r = odr_malloc(o, sizeof(*r));
 
@@ -332,7 +335,7 @@ Z_Segment *zget_Segment(ODR o)
     return r;
 }
 
-Z_Close *zget_Close(ODR o)
+Z_Close MDF *zget_Close(ODR o)
 {
     Z_Close *r = odr_malloc(o, sizeof(*r));
 
@@ -348,7 +351,7 @@ Z_Close *zget_Close(ODR o)
     return r;
 }
 
-Z_APDU *zget_APDU(ODR o, enum Z_APDU_which which)
+Z_APDU MDF *zget_APDU(ODR o, enum Z_APDU_which which)
 {
     Z_APDU *r = odr_malloc(o, sizeof(*r));
     
diff --git a/ccl/cclerrms.c b/ccl/cclerrms.c
index 9202e9f..bcdb4be 100644
--- a/ccl/cclerrms.c
+++ b/ccl/cclerrms.c
@@ -2,7 +2,10 @@
  * Europagate, 1995
  *
  * $Log: cclerrms.c,v $
- * Revision 1.1  1995-04-10 10:28:18  quinn
+ * Revision 1.2  1995-09-27 15:02:43  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.1  1995/04/10  10:28:18  quinn
  * Added copy of CCL.
  *
  * Revision 1.6  1995/02/23  08:31:59  adam
@@ -22,6 +25,8 @@
  *
  */
 
+#include <yconfig.h>
+
 char *err_msg_array[] = {
     "Ok",
     "Search word expected",
@@ -38,7 +43,7 @@ char *err_msg_array[] = {
     "Right truncation not supported"
 };
 
-const char *ccl_err_msg (int ccl_errno)
+const char MDF *ccl_err_msg (int ccl_errno)
 {
     return err_msg_array[ccl_errno];
 }
diff --git a/ccl/cclfind.c b/ccl/cclfind.c
index d0a71c9..4305df4 100644
--- a/ccl/cclfind.c
+++ b/ccl/cclfind.c
@@ -2,7 +2,10 @@
  * Europagate, 1995
  *
  * $Log: cclfind.c,v $
- * Revision 1.1  1995-04-10 10:28:19  quinn
+ * Revision 1.2  1995-09-27 15:02:44  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.1  1995/04/10  10:28:19  quinn
  * Added copy of CCL.
  *
  * Revision 1.12  1995/03/20  15:27:43  adam
@@ -106,7 +109,7 @@ static struct ccl_rpn_node *mk_node (enum rpn_node_kind kind)
     return p;
 }
 
-void ccl_rpn_delete (struct ccl_rpn_node *rpn)
+void MDF ccl_rpn_delete (struct ccl_rpn_node *rpn)
 {
     struct ccl_rpn_attr *attr, *attr1;
     if (!rpn)
@@ -551,7 +554,7 @@ static struct ccl_rpn_node *find_spec (struct ccl_rpn_attr **qa)
     return p1;
 }
 
-struct ccl_rpn_node *ccl_find (CCL_bibset abibset, struct ccl_token *list,
+struct ccl_rpn_node MDF *ccl_find (CCL_bibset abibset, struct ccl_token *list,
                                int *error, const char **pos)
 {
     struct ccl_rpn_node *p;
@@ -576,7 +579,7 @@ struct ccl_rpn_node *ccl_find (CCL_bibset abibset, struct ccl_token *list,
     return p;
 }
 
-struct ccl_rpn_node *ccl_find_str (CCL_bibset bibset, const char *str,
+struct ccl_rpn_node MDF *ccl_find_str (CCL_bibset bibset, const char *str,
                                    int *error, int *pos)
 {
     struct ccl_token *list;
diff --git a/ccl/cclptree.c b/ccl/cclptree.c
index 39abaf6..f91d270 100644
--- a/ccl/cclptree.c
+++ b/ccl/cclptree.c
@@ -2,7 +2,10 @@
  * Europagate, 1995
  *
  * $Log: cclptree.c,v $
- * Revision 1.1  1995-04-10 10:28:20  quinn
+ * Revision 1.2  1995-09-27 15:02:44  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.1  1995/04/10  10:28:20  quinn
  * Added copy of CCL.
  *
  * Revision 1.5  1995/02/23  08:31:59  adam
@@ -28,7 +31,7 @@
 
 #include <ccl.h>
 
-void ccl_pr_tree (struct ccl_rpn_node *rpn, FILE *fd_out)
+void MDF ccl_pr_tree (struct ccl_rpn_node *rpn, FILE *fd_out)
 {
 
     switch (rpn->kind)
diff --git a/ccl/cclqual.c b/ccl/cclqual.c
index 5ba4aa3..3fb76c7 100644
--- a/ccl/cclqual.c
+++ b/ccl/cclqual.c
@@ -2,7 +2,10 @@
  * Europagate, 1995
  *
  * $Log: cclqual.c,v $
- * Revision 1.1  1995-04-10 10:28:20  quinn
+ * Revision 1.2  1995-09-27 15:02:44  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.1  1995/04/10  10:28:20  quinn
  * Added copy of CCL.
  *
  * Revision 1.6  1995/02/23  08:32:00  adam
@@ -35,7 +38,7 @@ struct ccl_qualifiers {
     struct ccl_qualifier *list;
 };
 
-void ccl_qual_add (CCL_bibset b, const char *name, int no, int *pairs)
+void MDF ccl_qual_add (CCL_bibset b, const char *name, int no, int *pairs)
 {
     struct ccl_qualifier *q;
     struct ccl_rpn_attr **attrp;
@@ -77,7 +80,7 @@ void ccl_qual_add (CCL_bibset b, const char *name, int no, int *pairs)
     *attrp = NULL;
 }
 
-CCL_bibset ccl_qual_mk (void)
+CCL_bibset MDF ccl_qual_mk (void)
 {
     CCL_bibset b = malloc (sizeof(*b));
     assert (b);
@@ -85,13 +88,13 @@ CCL_bibset ccl_qual_mk (void)
     return b;
 }
 
-void ccl_qual_rm (CCL_bibset *b)
+void MDF ccl_qual_rm (CCL_bibset *b)
 {
     assert (*b);
     *b = NULL;
 }
 
-struct ccl_rpn_attr *ccl_qual_search (CCL_bibset b, const char *name, int len)
+struct ccl_rpn_attr MDF *ccl_qual_search (CCL_bibset b, const char *name, int len)
 {
     struct ccl_qualifier *q;
 
@@ -102,7 +105,7 @@ struct ccl_rpn_attr *ccl_qual_search (CCL_bibset b, const char *name, int len)
     return NULL;
 }
 
-void ccl_qual_file (CCL_bibset bibset, FILE *inf)
+void MDF ccl_qual_file (CCL_bibset bibset, FILE *inf)
 {
     char line[256];
     char *cp;
diff --git a/ccl/ccltoken.c b/ccl/ccltoken.c
index cfdc8d1..edd2974 100644
--- a/ccl/ccltoken.c
+++ b/ccl/ccltoken.c
@@ -2,7 +2,10 @@
  * Europagate, 1995
  *
  * $Log: ccltoken.c,v $
- * Revision 1.1  1995-04-10 10:28:22  quinn
+ * Revision 1.2  1995-09-27 15:02:44  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.1  1995/04/10  10:28:22  quinn
  * Added copy of CCL.
  *
  * Revision 1.5  1995/02/23  08:32:00  adam
@@ -44,7 +47,7 @@ const char *ccl_token_or = "or";
 const char *ccl_token_not = "not";
 const char *ccl_token_set = "set";
 
-struct ccl_token *ccl_tokenize (const char *command)
+struct ccl_token MDF *ccl_tokenize (const char *command)
 {
     const char *cp = command;
     struct ccl_token *first = NULL;
diff --git a/comstack/tcpip.c b/comstack/tcpip.c
index 6c684ad..effa27b 100644
--- a/comstack/tcpip.c
+++ b/comstack/tcpip.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: tcpip.c,v $
- * Revision 1.2  1995-06-15 12:30:06  quinn
+ * Revision 1.3  1995-09-27 15:02:45  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.2  1995/06/15  12:30:06  quinn
  * Added @ as hostname alias for INADDR ANY.
  *
  * Revision 1.1  1995/06/14  09:58:20  quinn
@@ -115,7 +118,7 @@ typedef struct tcpip_state
     int towrite;  /* to verify against user input */
 } tcpip_state;
 
-COMSTACK tcpip_type(int blocking, int protocol)
+COMSTACK MDF tcpip_type(int blocking, int protocol)
 {
     COMSTACK p;
     struct protoent *proto;
@@ -162,7 +165,7 @@ COMSTACK tcpip_type(int blocking, int protocol)
     return p;
 }
 
-struct sockaddr_in *tcpip_strtoaddr(const char *str)
+struct sockaddr_in MDF *tcpip_strtoaddr(const char *str)
 {
     static struct sockaddr_in add;
     struct hostent *hp;
diff --git a/comstack/xmosi.c b/comstack/xmosi.c
index f9dd6ab..9990468 100644
--- a/comstack/xmosi.c
+++ b/comstack/xmosi.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: xmosi.c,v $
- * Revision 1.3  1995-06-16 10:30:38  quinn
+ * Revision 1.4  1995-09-27 15:02:45  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.3  1995/06/16  10:30:38  quinn
  * Added REUSEADDR.
  *
  * Revision 1.2  1995/06/15  12:30:07  quinn
@@ -135,7 +138,7 @@ static int addopt(struct netbuf *optbuf, unsigned long level, unsigned long
     return 0;
 }
 
-COMSTACK mosi_type(int blocking, int protocol)
+COMSTACK MDF mosi_type(int blocking, int protocol)
 {
     COMSTACK r;
     mosi_state *state;
@@ -193,7 +196,7 @@ int hex2oct(char *hex, char *oct)
  * addressing specific to our hack of OSI transport. A sockaddr_in wrapped
  * up in a t_mosiaddr in a netbuf (on a stick).
  */
-struct netbuf *mosi_strtoaddr(const char *str)
+struct MDF netbuf MDF *mosi_strtoaddr(const char *str)
 {
     struct netbuf *ret = malloc(sizeof(struct netbuf));
     struct sockaddr_in *add = malloc(sizeof(struct sockaddr_in));
diff --git a/include/backend.h b/include/backend.h
index 73f40e2..75f9914 100644
--- a/include/backend.h
+++ b/include/backend.h
@@ -28,6 +28,7 @@
 #ifndef BACKEND_H
 #define BACKEND_H
 
+#include <yconfig.h>
 #include <proto.h>
 #include <statserv.h>
 
@@ -44,7 +45,7 @@ typedef struct bend_initresult
     void *handle;              /* private handle to the backend module */
 } bend_initresult;
 
-bend_initresult *bend_init(bend_initrequest *r);
+bend_initresult MDF MDF *bend_init(bend_initrequest *r);   
 
 typedef struct bend_searchrequest
 {
@@ -62,8 +63,8 @@ typedef struct bend_searchresult
     char *errstring;           /* system error string or NULL */
 } bend_searchresult;
 
-bend_searchresult *bend_search(void *handle, bend_searchrequest *r, int *fd);
-bend_searchresult *bend_searchresponse(void *handle);
+bend_searchresult MDF *bend_search(void *handle, bend_searchrequest *r, int *fd);
+bend_searchresult MDF *bend_searchresponse(void *handle);
 
 typedef struct bend_fetchrequest
 {
@@ -84,8 +85,8 @@ typedef struct bend_fetchresult
     char *errstring;           /* system error string or NULL */
 } bend_fetchresult;
 
-bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *r, int *fd);
-bend_fetchresult *bend_fetchresponse(void *handle);
+bend_fetchresult MDF *bend_fetch(void *handle, bend_fetchrequest *r, int *fd);
+bend_fetchresult MDF *bend_fetchresponse(void *handle);
 
 typedef struct bend_scanrequest
 {
@@ -114,8 +115,8 @@ typedef struct bend_scanresult
     char *errstring;
 } bend_scanresult;
 
-bend_scanresult *bend_scan(void *handle, bend_scanrequest *r, int *fd);
-bend_scanresult *bend_scanresponse(void *handle);
+bend_scanresult MDF *bend_scan(void *handle, bend_scanrequest *r, int *fd);
+bend_scanresult MDF *bend_scanresponse(void *handle);
 
 typedef struct bend_deleterequest
 {
@@ -128,9 +129,9 @@ typedef struct bend_deleteresult
     char *errstring;           /* system error string or NULL */
 } bend_deleteresult;
 
-bend_deleteresult *bend_delete(void *handle, bend_deleterequest *r, int *fd);
-bend_deleteresult *bend_deleteresponse(void *handle);
+bend_deleteresult MDF *bend_delete(void *handle, bend_deleterequest *r, int *fd);
+bend_deleteresult MDF *bend_deleteresponse(void *handle);
 
-void bend_close(void *handle);
+void MDF bend_close(void *handle);
 
 #endif
diff --git a/include/ccl.h b/include/ccl.h
index a5651ca..4483d90 100644
--- a/include/ccl.h
+++ b/include/ccl.h
@@ -2,7 +2,10 @@
  * Europagate, 1995
  *
  * $Log: ccl.h,v $
- * Revision 1.1  1995-04-10 10:28:27  quinn
+ * Revision 1.2  1995-09-27 15:02:46  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.1  1995/04/10  10:28:27  quinn
  * Added copy of CCL.
  *
  * Revision 1.5  1995/02/23  08:32:11  adam
@@ -23,6 +26,8 @@
 #ifndef CCL_H
 #define CCL_H
 
+#include <yconfig.h>
+
 /* CCL error numbers */
 #define CCL_ERR_OK                0
 #define CCL_ERR_TERM_EXPECTED     1
@@ -136,21 +141,21 @@ struct ccl_qualifier {
     struct ccl_qualifier *next;
 };
 
-struct ccl_token *ccl_tokenize (const char *command);
+struct ccl_token MDF *ccl_tokenize (const char *command);
 
-struct ccl_rpn_node *ccl_find_str (CCL_bibset bibset,
+struct ccl_rpn_node MDF *ccl_find_str (CCL_bibset bibset,
                                    const char *str, int *error, int *pos);
 
-struct ccl_rpn_node *ccl_find (CCL_bibset abibset, struct ccl_token *list,
+struct ccl_rpn_node MDF *ccl_find (CCL_bibset abibset, struct ccl_token *list,
                                int *error, const char **pos);
-char *ccl_err_msg (int ccl_errno);
-void ccl_rpn_delete (struct ccl_rpn_node *rpn);
-void ccl_pr_tree (struct ccl_rpn_node *rpn, FILE *fd_out);
+char MDF *ccl_err_msg (int ccl_errno);
+void MDF ccl_rpn_delete (struct ccl_rpn_node *rpn);
+void MDF ccl_pr_tree (struct ccl_rpn_node *rpn, FILE *fd_out);
 
-void ccl_qual_add (CCL_bibset b, const char *name, int no, int *attr);
-void ccl_qual_file (CCL_bibset bibset, FILE *inf);
-CCL_bibset ccl_qual_mk (void);
-void ccl_qual_rm (CCL_bibset *b);
+void MDF ccl_qual_add (CCL_bibset b, const char *name, int no, int *attr);
+void MDF ccl_qual_file (CCL_bibset bibset, FILE *inf);
+CCL_bibset MDF ccl_qual_mk (void);
+void MDF ccl_qual_rm (CCL_bibset *b);
 
 extern const char *ccl_token_and;
 extern const char *ccl_token_or;
@@ -158,6 +163,6 @@ extern const char *ccl_token_not;
 extern const char *ccl_token_set;
 
 
-struct ccl_rpn_attr *ccl_qual_search (CCL_bibset b, const char *name, int len);
+struct ccl_rpn_attr MDF *ccl_qual_search (CCL_bibset b, const char *name, int len);
 #endif
 
diff --git a/include/comstack.h b/include/comstack.h
index ffcc995..b931987 100644
--- a/include/comstack.h
+++ b/include/comstack.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: comstack.h,v $
- * Revision 1.7  1995-06-19 12:38:24  quinn
+ * Revision 1.8  1995-09-27 15:02:46  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.7  1995/06/19  12:38:24  quinn
  * Reorganized include-files. Added small features.
  *
  * Revision 1.6  1995/05/30  10:54:51  quinn
@@ -87,6 +90,7 @@
 #ifndef COMSTACK_H
 #define COMSTACK_H
 
+#include <yconfig.h>
 #include <oid.h>
 #include <dmalloc.h>
 
@@ -151,7 +155,7 @@ struct comstack
 #define cs_errno(handle) ((handle)->errno)
 #define cs_getproto(handle) ((handle)->protocol)
 
-const char *cs_strerror(COMSTACK h);
+const char MDF *cs_strerror(COMSTACK h);
 
 /*
  * error management.
diff --git a/include/diagbib1.h b/include/diagbib1.h
index b79fce8..55eb568 100644
--- a/include/diagbib1.h
+++ b/include/diagbib1.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: diagbib1.h,v $
- * Revision 1.2  1995-05-16 08:50:30  quinn
+ * Revision 1.3  1995-09-27 15:02:47  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.2  1995/05/16  08:50:30  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.1  1995/03/30  09:39:40  quinn
@@ -35,4 +38,6 @@
  *
  */
 
-const char *diagbib1_str (int code);
+#include <yconfig.h>
+
+const char MDF *diagbib1_str (int code);
diff --git a/include/dmalloc.h b/include/dmalloc.h
index e8adc07..bf8e5d7 100644
--- a/include/dmalloc.h
+++ b/include/dmalloc.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: dmalloc.h,v $
- * Revision 1.2  1995-05-16 08:50:30  quinn
+ * Revision 1.3  1995-09-27 15:02:47  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.2  1995/05/16  08:50:30  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.1  1995/03/30  09:39:40  quinn
@@ -42,6 +45,8 @@
 
 #ifdef DEBUG_MALLOC
 
+#include <yconfig.h>
+
 #ifdef malloc
 #undef malloc
 #endif
@@ -55,9 +60,9 @@
 #define free(p) d_free(__FILE__, __LINE__, (p))
 #define realloc(p, n) d_realloc(__FILE__, __LINE__, (p), (n))
 
-void *d_malloc(char *file, int line, int nbytes);
-void d_free(char *file, int line, char *ptr);
-void *d_realloc(char *file, int line, char *ptr, int nbytes);
+void MDF *d_malloc(char *file, int line, int nbytes);
+void MDF d_free(char *file, int line, char *ptr);
+void MDF *d_realloc(char *file, int line, char *ptr, int nbytes);
 
 #endif
 
diff --git a/include/log.h b/include/log.h
index fb365e0..80cc07e 100644
--- a/include/log.h
+++ b/include/log.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: log.h,v $
- * Revision 1.3  1995-06-19 12:38:25  quinn
+ * Revision 1.4  1995-09-27 15:02:47  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.3  1995/06/19  12:38:25  quinn
  * Reorganized include-files. Added small features.
  *
  * Revision 1.2  1995/05/16  08:50:31  quinn
@@ -50,6 +53,8 @@
 #ifndef LOG_H
 #define LOG_H
 
+#include <yconfig.h>
+
 #define LOG_FATAL 0x0001
 #define LOG_DEBUG 0x0002
 #define LOG_WARN  0x0004
@@ -60,9 +65,9 @@
 
 #define LOG_DEFAULT_LEVEL (LOG_FATAL | LOG_ERRNO | LOG_LOG | LOG_WARN)
 
-void log_init(int level, const char *prefix, const char *name);
-void logf(int level, const char *fmt, ...);
-int log_mask_str (const char *str);
-FILE *log_file(void);
+void MDF log_init(int level, const char *prefix, const char *name);
+void MDF logf(int level, const char *fmt, ...);
+int MDF log_mask_str (const char *str);
+FILE MDF *log_file(void);
 
 #endif
diff --git a/include/marcdisp.h b/include/marcdisp.h
index d7e1436..810629a 100644
--- a/include/marcdisp.h
+++ b/include/marcdisp.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: marcdisp.h,v $
- * Revision 1.2  1995-05-16 08:50:32  quinn
+ * Revision 1.3  1995-09-27 15:02:47  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.2  1995/05/16  08:50:32  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.1  1995/04/10  10:28:28  quinn
@@ -32,5 +35,6 @@
  *
  */
 
-int marc_display (const char *buf, FILE *outf);
+#include <yconfig.h>
+int MDF marc_display (const char *buf, FILE *outf);
 
diff --git a/include/odr.h b/include/odr.h
index e63d648..0a0976f 100644
--- a/include/odr.h
+++ b/include/odr.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: odr.h,v $
- * Revision 1.11  1995-08-15 12:00:09  quinn
+ * Revision 1.12  1995-09-27 15:02:48  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.11  1995/08/15  12:00:09  quinn
  * Updated External
  *
  * Revision 1.10  1995/08/10  08:54:33  quinn
@@ -111,6 +114,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <yconfig.h>
+
 #ifndef bool_t
 #define bool_t int
 #endif
@@ -264,17 +269,17 @@ typedef struct odr_arm
 
 extern char *odr_errlist[];
 
-int odr_geterror(ODR o);
-void odr_perror(ODR o, char *message);
-void odr_setprint(ODR o, FILE *file);
-ODR odr_createmem(int direction);
-void odr_reset(ODR o);
-void odr_destroy(ODR o);
-void odr_setbuf(ODR o, char *buf, int len, int can_grow);
-char *odr_getbuf(ODR o, int *len, int *size);
-void *odr_malloc(ODR o, int size);
-ODR_MEM odr_extract_mem(ODR o);
-void odr_release_mem(ODR_MEM p);
+int MDF odr_geterror(ODR o);
+void MDF odr_perror(ODR o, char *message);
+void MDF odr_setprint(ODR o, FILE *file);
+ODR MDF odr_createmem(int direction);
+void MDF odr_reset(ODR o);
+void MDF odr_destroy(ODR o);
+void MDF odr_setbuf(ODR o, char *buf, int len, int can_grow);
+char MDF *odr_getbuf(ODR o, int *len, int *size);
+void MDF *odr_malloc(ODR o, int size);
+ODR_MEM MDF odr_extract_mem(ODR o);
+void MDF odr_release_mem(ODR_MEM p);
 
 #define odr_implicit(o, t, p, cl, tg, opt)\
 	(odr_implicit_settag((o), cl, tg), t ((o), (p), opt) )
diff --git a/include/odr_use.h b/include/odr_use.h
index 9721ebc..e03d9fb 100644
--- a/include/odr_use.h
+++ b/include/odr_use.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: odr_use.h,v $
- * Revision 1.4  1995-08-10 08:54:34  quinn
+ * Revision 1.5  1995-09-27 15:02:48  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.4  1995/08/10  08:54:34  quinn
  * Added Explain.
  *
  * Revision 1.3  1995/06/19  12:38:27  quinn
@@ -47,6 +50,8 @@
 #ifndef ODR_USE_H
 #define ODR_USE_H
 
+#include <yconfig.h>
+
 typedef struct Odr_external
 {
     Odr_oid *direct_reference;       /* OPTIONAL */
@@ -64,10 +69,10 @@ typedef struct Odr_external
     } u;
 } Odr_external;
 
-int odr_external(ODR o, Odr_external **p, int opt);
+int MDF odr_external(ODR o, Odr_external **p, int opt);
 
-int odr_visiblestring(ODR o, char **p, int opt);
-int odr_graphicstring(ODR o, char **p, int opt);
-int odr_generalizedtime(ODR o, char **p, int opt);
+int MDF odr_visiblestring(ODR o, char **p, int opt);
+int MDF odr_graphicstring(ODR o, char **p, int opt);
+int MDF odr_generalizedtime(ODR o, char **p, int opt);
 
 #endif
diff --git a/include/oid.h b/include/oid.h
index 726cddd..35ec8a1 100644
--- a/include/oid.h
+++ b/include/oid.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: oid.h,v $
- * Revision 1.5  1995-09-12 11:31:46  quinn
+ * Revision 1.6  1995-09-27 15:02:48  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.5  1995/09/12  11:31:46  quinn
  * Added some oids.
  *
  * Revision 1.4  1995/06/27  13:20:32  quinn
@@ -48,6 +51,8 @@
 #ifndef OID_H
 #define OID_H
 
+#include <yconfig.h>
+
 #define OID_SIZE 100
 
 typedef struct oident
@@ -134,12 +139,12 @@ typedef enum oid_proto oid_proto;
 typedef enum oid_class oid_class;
 typedef enum oid_value oid_value;
 
-int *oid_getoidbyent(struct oident *ent);
-struct oident *oid_getentbyoid(int *o);
-void oid_oidcpy(int *t, int *s);
-void oid_oidcat(int *t, int *s);
-int oid_oidcmp(int *o1, int *o2);
-int oid_oidlen(int *o);
-oid_value oid_getvalbyname(char *name);
+int MDF *oid_getoidbyent(struct oident *ent);
+struct oident MDF *oid_getentbyoid(int *o);
+void MDF oid_oidcpy(int *t, int *s);
+void MDF oid_oidcat(int *t, int *s);
+int MDF oid_oidcmp(int *o1, int *o2);
+int MDF oid_oidlen(int *o);
+oid_value MDF oid_getvalbyname(char *name);
 
 #endif
diff --git a/include/options.h b/include/options.h
index a282e48..cb579d0 100644
--- a/include/options.h
+++ b/include/options.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: options.h,v $
- * Revision 1.2  1995-05-16 08:50:36  quinn
+ * Revision 1.3  1995-09-27 15:02:48  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.2  1995/05/16  08:50:36  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.1  1995/03/30  09:39:42  quinn
@@ -44,6 +47,7 @@
 
 #ifndef OPTIONS_H
 #define OPTIONS_H
-int options (const char *desc, char **argv, int argc, char **arg);
+#include <yconfig.h>
+int MDF options (const char *desc, char **argv, int argc, char **arg);
 #endif
 	
diff --git a/include/pquery.h b/include/pquery.h
index ab1a3b3..e4ea30a 100644
--- a/include/pquery.h
+++ b/include/pquery.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: pquery.h,v $
- * Revision 1.2  1995-05-26 08:56:05  adam
+ * Revision 1.3  1995-09-27 15:02:49  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.2  1995/05/26  08:56:05  adam
  * New function: p_query_scan.
  *
  * Revision 1.1  1995/05/22  15:31:05  adam
@@ -35,8 +38,9 @@
 #ifndef PQUERY_H
 #define PQUERY_H
 
+#include <yconfig.h>
 #include <proto.h>
 
-Z_RPNQuery *p_query_rpn (ODR o, const char *qbuf);
-Z_AttributesPlusTerm *p_query_scan (ODR o, const char *qbuf);
+Z_RPNQuery MDF *p_query_rpn (ODR o, const char *qbuf);
+Z_AttributesPlusTerm MDF *p_query_scan (ODR o, const char *qbuf);
 #endif
diff --git a/include/proto.h b/include/proto.h
index 08a8e90..cc4a107 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: proto.h,v $
- * Revision 1.24  1995-08-29 11:17:43  quinn
+ * Revision 1.25  1995-09-27 15:02:49  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.24  1995/08/29  11:17:43  quinn
  * *** empty log message ***
  *
  * Revision 1.23  1995/08/21  09:10:36  quinn
@@ -132,6 +135,7 @@
 #ifndef PROTO_H
 #define PROTO_H
 
+#include <yconfig.h>
 #include <odr.h>
 #include <oid.h>
 #include <odr_use.h>
@@ -307,9 +311,9 @@ typedef struct Z_NSRAuthentication
     char *account;
 } Z_NSRAuthentication;
 
-int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt);
+int MDF z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt);
 
-int z_StrAuthentication(ODR o, char **p, int opt);
+int MDF z_StrAuthentication(ODR o, char **p, int opt);
 
 /* ------------------ SEARCH SERVICE ----------------*/
 
@@ -1122,38 +1126,38 @@ typedef struct Z_APDU
     } u;
 } Z_APDU;
 
-int z_APDU(ODR o, Z_APDU **p, int opt);
-int z_SUTRS(ODR o, Odr_oct **p, int opt);
-
-Z_InitRequest *zget_InitRequest(ODR o);
-Z_InitResponse *zget_InitResponse(ODR o);
-Z_SearchRequest *zget_SearchRequest(ODR o);
-Z_SearchResponse *zget_SearchResponse(ODR o);
-Z_PresentRequest *zget_PresentRequest(ODR o);
-Z_PresentResponse *zget_PresentResponse(ODR o);
-Z_DeleteResultSetRequest *zget_DeleteResultSetRequest(ODR o);
-Z_DeleteResultSetResponse *zget_DeleteResultSetResponse(ODR o);
-Z_ScanRequest *zget_ScanRequest(ODR o);
-Z_ScanResponse *zget_ScanResponse(ODR o);
-Z_TriggerResourceControlRequest *zget_TriggerResourceControlRequest(ODR o);
-Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o);
-Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o);
-Z_Close *zget_Close(ODR o);
-int z_InternationalString(ODR o, char **p, int opt);
-int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt);
-int z_ElementSetName(ODR o, char **p, int opt);
-int z_IntUnit(ODR o, Z_IntUnit **p, int opt);
-int z_Unit(ODR o, Z_Unit **p, int opt);
-int z_DatabaseName(ODR o, Z_DatabaseName **p, int opt);
-int z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt);
-int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt);
-int z_Term(ODR o, Z_Term **p, int opt);
-int z_Specification(ODR o, Z_Specification **p, int opt);
-int z_Permissions(ODR o, Z_Permissions **p, int opt);
-int z_DiagRec(ODR o, Z_DiagRec **p, int opt);
-int z_AttributeList(ODR o, Z_AttributeList **p, int opt);
-int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt);
-Z_APDU *zget_APDU(ODR o, enum Z_APDU_which which);
+int MDF z_APDU(ODR o, Z_APDU **p, int opt);
+int MDF z_SUTRS(ODR o, Odr_oct **p, int opt);
+
+Z_InitRequest MDF *zget_InitRequest(ODR o);
+Z_InitResponse MDF *zget_InitResponse(ODR o);
+Z_SearchRequest MDF *zget_SearchRequest(ODR o);
+Z_SearchResponse MDF *zget_SearchResponse(ODR o);
+Z_PresentRequest MDF *zget_PresentRequest(ODR o);
+Z_PresentResponse MDF *zget_PresentResponse(ODR o);
+Z_DeleteResultSetRequest MDF *zget_DeleteResultSetRequest(ODR o);
+Z_DeleteResultSetResponse MDF *zget_DeleteResultSetResponse(ODR o);
+Z_ScanRequest MDF *zget_ScanRequest(ODR o);
+Z_ScanResponse MDF *zget_ScanResponse(ODR o);
+Z_TriggerResourceControlRequest MDF *zget_TriggerResourceControlRequest(ODR o);
+Z_ResourceControlRequest MDF *zget_ResourceControlRequest(ODR o);
+Z_ResourceControlResponse MDF *zget_ResourceControlResponse(ODR o);
+Z_Close MDF *zget_Close(ODR o);
+int MDF z_InternationalString(ODR o, char **p, int opt);
+int MDF z_OtherInformation(ODR o, Z_OtherInformation **p, int opt);
+int MDF z_ElementSetName(ODR o, char **p, int opt);
+int MDF z_IntUnit(ODR o, Z_IntUnit **p, int opt);
+int MDF z_Unit(ODR o, Z_Unit **p, int opt);
+int MDF z_DatabaseName(ODR o, Z_DatabaseName **p, int opt);
+int MDF z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt);
+int MDF z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt);
+int MDF z_Term(ODR o, Z_Term **p, int opt);
+int MDF z_Specification(ODR o, Z_Specification **p, int opt);
+int MDF z_Permissions(ODR o, Z_Permissions **p, int opt);
+int MDF z_DiagRec(ODR o, Z_DiagRec **p, int opt);
+int MDF z_AttributeList(ODR o, Z_AttributeList **p, int opt);
+int MDF z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt);
+Z_APDU MDF *zget_APDU(ODR o, enum Z_APDU_which which);
 
 #include <prt-rsc.h>
 #include <prt-acc.h>
diff --git a/include/prt-acc.h b/include/prt-acc.h
index 999a430..fb8324c 100644
--- a/include/prt-acc.h
+++ b/include/prt-acc.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: prt-acc.h,v $
- * Revision 1.3  1995-08-17 12:45:16  quinn
+ * Revision 1.4  1995-09-27 15:02:49  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.3  1995/08/17  12:45:16  quinn
  * Fixed minor problems with GRS-1. Added support in c&s.
  *
  * Revision 1.2  1995/08/15  12:00:13  quinn
@@ -36,6 +39,9 @@
  *
  */
 
+#ifndef PRT_ACC_H
+#define PRT_ACC_H
+
 typedef struct Z_Encryption1
 {
     Odr_oct *cryptType;       /* OPTIONAL */
@@ -149,4 +155,6 @@ typedef struct Z_PromptObject1
     } u;
 } Z_PromptObject1;
 
-int z_PromptObject1(ODR o, Z_PromptObject1 **p, int opt);
+int MDF z_PromptObject1(ODR o, Z_PromptObject1 **p, int opt);
+
+#endif
diff --git a/include/prt-dia.h b/include/prt-dia.h
index 5ca67db..6a6a3f0 100644
--- a/include/prt-dia.h
+++ b/include/prt-dia.h
@@ -25,6 +25,11 @@
  *
  */
 
+#ifndef PRT_DIA_H
+#define PRT_DIA_H
+
+#include <yconfig.h>
+
 typedef struct Z_TooMany
 {
     int *tooManyWhat;
@@ -339,4 +344,6 @@ typedef struct Z_DiagnosticFormat
     Z_DiagnosticUnit **diagnostics;
 } Z_DiagnosticFormat;
 
-int z_DiagnosticFormat(ODR o, Z_DiagnosticFormat **p, int opt);
+int MDF z_DiagnosticFormat(ODR o, Z_DiagnosticFormat **p, int opt);
+
+#endif
diff --git a/include/prt-exd.h b/include/prt-exd.h
index c13fe14..34dad37 100644
--- a/include/prt-exd.h
+++ b/include/prt-exd.h
@@ -25,6 +25,11 @@
  *
  */
 
+#ifndef PRT_EXD_H
+#define PRT_EXD_H
+
+#include <yconfig.h>
+
 typedef struct Z_TaskPackage
 {
     Odr_oid *packageType;                 
@@ -45,7 +50,7 @@ typedef struct Z_TaskPackage
     Z_External *taskSpecificParameters;   
 } Z_TaskPackage;
 
-int z_TaskPackage(ODR o, Z_TaskPackage **p, int opt);
+int MDF z_TaskPackage(ODR o, Z_TaskPackage **p, int opt);
 
 /* ----------------------- ITEM ORDER ------------------------- */
 
@@ -142,4 +147,6 @@ typedef struct Z_ItemOrder
     } u;
 } Z_ItemOrder;
 
-int z_ItemOrder(ODR o, Z_ItemOrder **p, int opt);
+int MDF z_ItemOrder(ODR o, Z_ItemOrder **p, int opt);
+
+#endif
diff --git a/include/prt-exp.h b/include/prt-exp.h
index c442fb7..f84b9c5 100644
--- a/include/prt-exp.h
+++ b/include/prt-exp.h
@@ -25,6 +25,10 @@
  *
  */
 
+#ifndef PRT_EXP_H
+#define PRT_EXP_H
+
+#include <yconfig.h>
 
 typedef struct Z_CommonInfo
 {
@@ -1011,4 +1015,6 @@ typedef struct Z_ExplainRecord
     } u;
 } Z_ExplainRecord;
 
-int z_ExplainRecord(ODR o, Z_ExplainRecord **p, int opt);
+int MDF z_ExplainRecord(ODR o, Z_ExplainRecord **p, int opt);
+
+#endif
diff --git a/include/prt-ext.h b/include/prt-ext.h
index d7f2ddf..27b2af5 100644
--- a/include/prt-ext.h
+++ b/include/prt-ext.h
@@ -29,6 +29,11 @@
  * Biased-choice External for Z39.50.
  */
 
+#ifndef PRT_EXT_H
+#define PRT_EXT_H
+
+#include <yconfig.h>
+
 struct Z_External
 {
     Odr_oid *direct_reference;
@@ -72,4 +77,6 @@ struct Z_External
     } u;
 };
 
-int z_External(ODR o, Z_External **p, int opt);
+int MDF z_External(ODR o, Z_External **p, int opt);
+
+#endif
diff --git a/include/prt-grs.h b/include/prt-grs.h
index d80ad09..75f83dd 100644
--- a/include/prt-grs.h
+++ b/include/prt-grs.h
@@ -25,6 +25,11 @@
  *
  */
 
+#ifndef PRT_GRS_H
+#define PRT_GRS_H
+
+#include <yconfig.h>
+
 struct Z_GenericRecord;
 typedef struct Z_GenericRecord Z_GenericRecord;
 
@@ -169,4 +174,6 @@ struct Z_GenericRecord
     Z_TaggedElement **elements;
 };
 
-int z_GenericRecord(ODR o, Z_GenericRecord **p, int opt);
+int MDF z_GenericRecord(ODR o, Z_GenericRecord **p, int opt);
+
+#endif
diff --git a/include/prt-rsc.h b/include/prt-rsc.h
index 2796bc3..e1ec0c8 100644
--- a/include/prt-rsc.h
+++ b/include/prt-rsc.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: prt-rsc.h,v $
- * Revision 1.3  1995-08-17 12:45:17  quinn
+ * Revision 1.4  1995-09-27 15:02:52  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.3  1995/08/17  12:45:17  quinn
  * Fixed minor problems with GRS-1. Added support in c&s.
  *
  * Revision 1.2  1995/06/02  09:49:50  quinn
@@ -39,6 +42,8 @@
 #ifndef PRT_RSC_H
 #define PRT_RSC_H
 
+#include <yconfig.h>
+
 /* -------------------- Resource-1 -------------------- */
 
 #define Z_EstimateType_currentSearchRecords           1
@@ -72,7 +77,7 @@ typedef struct Z_ResourceReport1
     char *message;
 } Z_ResourceReport1;
 
-int z_ResourceReport1(ODR o, Z_ResourceReport1 **p, int opt);
+int MDF z_ResourceReport1(ODR o, Z_ResourceReport1 **p, int opt);
 
 /* -------------------- Resource-2 -------------------- */
 
@@ -89,6 +94,6 @@ typedef struct Z_ResourceReport2
     char *message;                       /* OPTIONAL */
 } Z_ResourceReport2;
 
-int z_ResourceReport2(ODR o, Z_ResourceReport2 **p, int opt);
+int MDF z_ResourceReport2(ODR o, Z_ResourceReport2 **p, int opt);
 
 #endif
diff --git a/include/prt.h b/include/prt.h
index 0b45d2b..1855630 100644
--- a/include/prt.h
+++ b/include/prt.h
@@ -1,46 +1,53 @@
-int ber_boolean(ODR o, int *val);
-int ber_tag(ODR o, void *p, int class, int tag, int *constructed, int opt);
-int ber_enctag(ODR o, int class, int tag, int constructed);
-int ber_dectag(unsigned char *buf, int *class, int *tag, int *constructed);
-int odr_bool(ODR o, int **p, int opt);
-int odr_integer(ODR o, int **p, int opt);
-int odr_implicit_settag(ODR o, int class, int tag);
+#ifndef PRT_H
+#define PRT_H
+
+#include <yconfig.h>
+
+int MDF ber_boolean(ODR o, int *val);
+int MDF ber_tag(ODR o, void *p, int class, int tag, int *constructed, int opt);
+int MDF ber_enctag(ODR o, int class, int tag, int constructed);
+int MDF ber_dectag(unsigned char *buf, int *class, int *tag, int *constructed);
+int MDF odr_bool(ODR o, int **p, int opt);
+int MDF odr_integer(ODR o, int **p, int opt);
+int MDF odr_implicit_settag(ODR o, int class, int tag);
 #if 0
-int odr_implicit(ODR o, int (*type)(ODR o, void *p, int opt), void *p,
+int MDF odr_implicit(ODR o, int (*type)(ODR o, void *p, int opt), void *p,
     int class, int tag, int opt);
 #endif
-int ber_enclen(ODR o, int len, int lenlen, int exact);
-int ber_declen(unsigned char *buf, int *len);
-char *odr_indent(ODR o);
-int ber_null(ODR o);
-int odr_null(ODR o, Odr_null **p, int opt);
-int ber_integer(ODR o, int *val);
-int odr_constructed_begin(ODR o, void *p, int class, int tag);
-int odr_constructed_end(ODR o);
-int odr_sequence_begin(ODR o, void *p, int size);
-int odr_sequence_end(ODR o);
-int ber_octetstring(ODR o, Odr_oct *p, int cons);
-int odr_octetstring(ODR o, Odr_oct **p, int opt);
-int odp_more_chunks(ODR o, unsigned char *base, int len);
-int odr_constructed_more(ODR o);
-int odr_bitstring(ODR o, Odr_bitmask **p, int opt);
-int ber_bitstring(ODR o, Odr_bitmask *p, int cons);
-int odr_generalstring(ODR o, char **p, int opt);
-int ber_oidc(ODR o, Odr_oid *p);
-int odr_oid(ODR o, Odr_oid **p, int opt);
-int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp);
-int odr_cstring(ODR o, char **p, int opt);
-int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num);
-int odr_any(ODR o, Odr_any **p, int opt);
-int ber_any(ODR o, Odr_any **p);
-int completeBER(unsigned char *buf, int len);
-void odr_begin(ODR o);
-void odr_end(ODR o);
-void odr_release_mem(struct odr_memblock *p);
-Odr_oid *odr_oiddup(ODR odr, Odr_oid *o);
-int odr_grow_block(odr_ecblock *b, int min_bytes);
-int odr_write(ODR o, unsigned char *buf, int bytes);
-int odr_seek(ODR o, int whence, int offset);
-int odr_dumpBER(FILE *f, char *buf, int len);
-void odr_choice_bias(ODR o, int what);
-int odr_total(ODR o);
+int MDF ber_enclen(ODR o, int len, int lenlen, int exact);
+int MDF ber_declen(unsigned char *buf, int *len);
+char MDF *odr_indent(ODR o);
+int MDF ber_null(ODR o);
+int MDF odr_null(ODR o, Odr_null **p, int opt);
+int MDF ber_integer(ODR o, int *val);
+int MDF odr_constructed_begin(ODR o, void *p, int class, int tag);
+int MDF odr_constructed_end(ODR o);
+int MDF odr_sequence_begin(ODR o, void *p, int size);
+int MDF odr_sequence_end(ODR o);
+int MDF ber_octetstring(ODR o, Odr_oct *p, int cons);
+int MDF odr_octetstring(ODR o, Odr_oct **p, int opt);
+int MDF odp_more_chunks(ODR o, unsigned char *base, int len);
+int MDF odr_constructed_more(ODR o);
+int MDF odr_bitstring(ODR o, Odr_bitmask **p, int opt);
+int MDF ber_bitstring(ODR o, Odr_bitmask *p, int cons);
+int MDF odr_generalstring(ODR o, char **p, int opt);
+int MDF ber_oidc(ODR o, Odr_oid *p);
+int MDF odr_oid(ODR o, Odr_oid **p, int opt);
+int MDF odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp);
+int MDF odr_cstring(ODR o, char **p, int opt);
+int MDF odr_sequence_of(ODR o, Odr_fun type, void *p, int *num);
+int MDF odr_any(ODR o, Odr_any **p, int opt);
+int MDF ber_any(ODR o, Odr_any **p);
+int MDF completeBER(unsigned char *buf, int len);
+void MDF odr_begin(ODR o);
+void MDF odr_end(ODR o);
+void MDF odr_release_mem(struct odr_memblock *p);
+Odr_oid MDF *odr_oiddup(ODR odr, Odr_oid *o);
+int MDF odr_grow_block(odr_ecblock *b, int min_bytes);
+int MDF odr_write(ODR o, unsigned char *buf, int bytes);
+int MDF odr_seek(ODR o, int whence, int offset);
+int MDF odr_dumpBER(FILE *f, char *buf, int len);
+void MDF odr_choice_bias(ODR o, int what);
+int MDF odr_total(ODR o);
+
+#endif
diff --git a/include/statserv.h b/include/statserv.h
index 1caa038..7295280 100644
--- a/include/statserv.h
+++ b/include/statserv.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: statserv.h,v $
- * Revision 1.5  1995-06-19 12:38:31  quinn
+ * Revision 1.6  1995-09-27 15:02:53  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.5  1995/06/19  12:38:31  quinn
  * Reorganized include-files. Added small features.
  *
  * Revision 1.4  1995/06/15  07:45:08  quinn
@@ -39,6 +42,7 @@
 #ifndef STATSERVER_H
 #define STATSERVER_H
 
+#include <yconfig.h>
 #include <oid.h>
 
 typedef struct statserv_options_block
@@ -55,8 +59,8 @@ typedef struct statserv_options_block
     char setuid[ODR_MAXNAME+1];     /* setuid to this user after binding */
 } statserv_options_block;
 
-int statserv_main(int argc, char **argv);
-statserv_options_block *statserv_getcontrol(void);
-void statserv_setcontrol(statserv_options_block *block);
+int MDF statserv_main(int argc, char **argv);
+statserv_options_block MDF *statserv_getcontrol(void);
+void MDF statserv_setcontrol(statserv_options_block *block);
 
 #endif
diff --git a/include/tcpip.h b/include/tcpip.h
index 3a4e1a6..ddb2a5a 100644
--- a/include/tcpip.h
+++ b/include/tcpip.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: tcpip.h,v $
- * Revision 1.2  1995-05-16 08:50:39  quinn
+ * Revision 1.3  1995-09-27 15:02:53  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.2  1995/05/16  08:50:39  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.1  1995/03/30  09:39:43  quinn
@@ -45,14 +48,15 @@
 #ifndef TCPIP_H
 #define TCPIP_H
 
+#include <yconfig.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-struct sockaddr_in *tcpip_strtoaddr(const char *str);
+struct sockaddr_in MDF *tcpip_strtoaddr(const char *str);
 
-COMSTACK tcpip_type(int blocking, int protocol);
+COMSTACK MDF tcpip_type(int blocking, int protocol);
 
 #endif
diff --git a/include/xmosi.h b/include/xmosi.h
index 540b9ac..24cd7c9 100644
--- a/include/xmosi.h
+++ b/include/xmosi.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: xmosi.h,v $
- * Revision 1.2  1995-05-16 08:50:39  quinn
+ * Revision 1.3  1995-09-27 15:02:53  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.2  1995/05/16  08:50:39  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.1  1995/03/30  09:39:43  quinn
@@ -45,14 +48,15 @@
 #ifndef XMOSI_H
 #define XMOSI_H
 
+#include <yconfig.h>
 #include <stdio.h>
 #include <xti.h>
 #include <xti92.h>
 #include <xtiUser.h>
 #include <mosi.h>
 
-struct netbuf *mosi_strtoaddr(const char *str);
+struct netbuf MDF *mosi_strtoaddr(const char *str);
 
-COMSTACK mosi_type(int blocking, int protocol);
+COMSTACK MDF mosi_type(int blocking, int protocol);
 
 #endif
diff --git a/include/yaz-ccl.h b/include/yaz-ccl.h
index d840f75..21cff6c 100644
--- a/include/yaz-ccl.h
+++ b/include/yaz-ccl.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: yaz-ccl.h,v $
- * Revision 1.3  1995-05-16 08:50:40  quinn
+ * Revision 1.4  1995-09-27 15:02:54  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.3  1995/05/16  08:50:40  quinn
  * License, documentation, and memory fixes
  *
  *
@@ -33,10 +36,11 @@
 #ifndef YAZ_CCL_H
 #define YAZ_CCL_H
 
+#include <yconfig.h>
 #include <proto.h>
 #include <ccl.h>
 
-Z_RPNQuery *ccl_rpn_query (struct ccl_rpn_node *p);
-Z_AttributesPlusTerm *ccl_scan_query (struct ccl_rpn_node *p);
+Z_RPNQuery MDF *ccl_rpn_query (struct ccl_rpn_node *p);
+Z_AttributesPlusTerm MDF *ccl_scan_query (struct ccl_rpn_node *p);
 
 #endif
diff --git a/odr/ber_any.c b/odr/ber_any.c
index 51dc7f3..76f726a 100644
--- a/odr/ber_any.c
+++ b/odr/ber_any.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_any.c,v $
- * Revision 1.10  1995-05-16 08:50:42  quinn
+ * Revision 1.11  1995-09-27 15:02:54  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.10  1995/05/16  08:50:42  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.9  1995/04/18  08:15:12  quinn
@@ -39,7 +42,7 @@
 
 #include <odr.h>
 
-int ber_any(ODR o, Odr_any **p)
+int MDF ber_any(ODR o, Odr_any **p)
 {
     int res;
 
@@ -68,7 +71,7 @@ int ber_any(ODR o, Odr_any **p)
 /*
  * Return length of BER-package or 0.
  */
-int completeBER(unsigned char *buf, int len)
+int MDF completeBER(unsigned char *buf, int len)
 {
     int res, ll, class, tag, cons;
     unsigned char *b = buf;
diff --git a/odr/ber_bit.c b/odr/ber_bit.c
index d939426..bbb202e 100644
--- a/odr/ber_bit.c
+++ b/odr/ber_bit.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_bit.c,v $
- * Revision 1.5  1995-05-16 08:50:43  quinn
+ * Revision 1.6  1995-09-27 15:02:54  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.5  1995/05/16  08:50:43  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.4  1995/04/18  08:15:13  quinn
@@ -25,7 +28,7 @@
 
 #include <odr.h>
 
-int ber_bitstring(ODR o, Odr_bitmask *p, int cons)
+int MDF ber_bitstring(ODR o, Odr_bitmask *p, int cons)
 {
     int res, len;
     unsigned char *base;
diff --git a/odr/ber_bool.c b/odr/ber_bool.c
index 56b9e88..0657d5b 100644
--- a/odr/ber_bool.c
+++ b/odr/ber_bool.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_bool.c,v $
- * Revision 1.6  1995-05-16 08:50:43  quinn
+ * Revision 1.7  1995-09-27 15:02:55  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.6  1995/05/16  08:50:43  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.5  1995/04/18  08:15:14  quinn
@@ -29,7 +32,7 @@
 #include <odr.h>
 
 
-int ber_boolean(ODR o, int *val)
+int MDF ber_boolean(ODR o, int *val)
 {
     int res, len;
 
diff --git a/odr/ber_int.c b/odr/ber_int.c
index c22f7d5..e6a6bfd 100644
--- a/odr/ber_int.c
+++ b/odr/ber_int.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_int.c,v $
- * Revision 1.7  1995-05-16 08:50:44  quinn
+ * Revision 1.8  1995-09-27 15:02:55  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.7  1995/05/16  08:50:44  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.6  1995/04/18  08:15:14  quinn
@@ -36,7 +39,7 @@
 static int ber_encinteger(ODR o, int val);
 static int ber_decinteger(unsigned char *buf, int *val);
 
-int ber_integer(ODR o, int *val)
+int MDF ber_integer(ODR o, int *val)
 {
     int res;
 
diff --git a/odr/ber_len.c b/odr/ber_len.c
index 79de57e..c770780 100644
--- a/odr/ber_len.c
+++ b/odr/ber_len.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_len.c,v $
- * Revision 1.4  1995-05-16 08:50:45  quinn
+ * Revision 1.5  1995-09-27 15:02:55  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.4  1995/05/16  08:50:45  quinn
  * License, documentation, and memory fixes
  *
  *
@@ -21,7 +24,7 @@
  * Returns: =0   success, indefinite start-marker set. 1 byte encoded.
  * Returns: -1   failure, out of bounds.
  */
-int ber_enclen(ODR o, int len, int lenlen, int exact)
+int MDF ber_enclen(ODR o, int len, int lenlen, int exact)
 {
     unsigned char octs[sizeof(int)];
     int n = 0;
@@ -85,7 +88,7 @@ int ber_enclen(ODR o, int len, int lenlen, int exact)
  * len = -1   indefinite.
  * len >= 0    Length.
  */
-int ber_declen(unsigned char *buf, int *len)
+int MDF ber_declen(unsigned char *buf, int *len)
 {
     unsigned char *b = buf;
     int n;
diff --git a/odr/ber_null.c b/odr/ber_null.c
index 09c0f54..095100b 100644
--- a/odr/ber_null.c
+++ b/odr/ber_null.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_null.c,v $
- * Revision 1.6  1995-05-22 11:32:01  quinn
+ * Revision 1.7  1995-09-27 15:02:55  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.6  1995/05/22  11:32:01  quinn
  * Fixing Interface to odr_null.
  *
  * Revision 1.5  1995/05/16  08:50:46  quinn
@@ -30,7 +33,7 @@
 /*
  * BER-en/decoder for NULL type.
  */
-int ber_null(ODR o)
+int MDF ber_null(ODR o)
 {
     switch (o->direction)
     {
diff --git a/odr/ber_oct.c b/odr/ber_oct.c
index 46e6297..ee45789 100644
--- a/odr/ber_oct.c
+++ b/odr/ber_oct.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_oct.c,v $
- * Revision 1.8  1995-05-16 08:50:47  quinn
+ * Revision 1.9  1995-09-27 15:02:55  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.8  1995/05/16  08:50:47  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.7  1995/04/18  08:15:17  quinn
@@ -33,7 +36,7 @@
 
 #include <odr.h>
 
-int ber_octetstring(ODR o, Odr_oct *p, int cons)
+int MDF ber_octetstring(ODR o, Odr_oct *p, int cons)
 {
     int res, len;
     unsigned char *base, *c;
diff --git a/odr/ber_oid.c b/odr/ber_oid.c
index d6012a6..58b7637 100644
--- a/odr/ber_oid.c
+++ b/odr/ber_oid.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_oid.c,v $
- * Revision 1.7  1995-05-16 08:50:47  quinn
+ * Revision 1.8  1995-09-27 15:02:56  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.7  1995/05/16  08:50:47  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.6  1995/04/18  08:15:18  quinn
@@ -30,7 +33,7 @@
 
 #include <odr.h>
 
-int ber_oidc(ODR o, Odr_oid *p)
+int MDF ber_oidc(ODR o, Odr_oid *p)
 {
     int len, lenp, end;
     int pos, n, res, id;
diff --git a/odr/ber_tag.c b/odr/ber_tag.c
index fa4a5ab..b626f0a 100644
--- a/odr/ber_tag.c
+++ b/odr/ber_tag.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_tag.c,v $
- * Revision 1.11  1995-05-16 08:50:48  quinn
+ * Revision 1.12  1995-09-27 15:02:57  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.11  1995/05/16  08:50:48  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.10  1995/04/18  08:15:18  quinn
@@ -53,7 +56,7 @@
  *
  * Should perhaps be odr_tag?
 */
-int ber_tag(ODR o, void *p, int class, int tag, int *constructed, int opt)
+int MDF ber_tag(ODR o, void *p, int class, int tag, int *constructed, int opt)
 {
     static int lclass = -1, ltag, br, lcons; /* save t&c rather than
 						decoding twice */
@@ -131,7 +134,7 @@ int ber_tag(ODR o, void *p, int class, int tag, int *constructed, int opt)
  * BER-encode a class/tag/constructed package (identifier octets). Return
  * number of bytes encoded, or -1 if out of bounds.
  */
-int ber_enctag(ODR o, int class, int tag, int constructed)
+int MDF ber_enctag(ODR o, int class, int tag, int constructed)
 {
     int cons = (constructed ? 1 : 0), n = 0;
     unsigned char octs[sizeof(int)], b;
@@ -171,7 +174,7 @@ int ber_enctag(ODR o, int class, int tag, int constructed)
 /* ber_dectag
  * Decode BER identifier octets. Return number of bytes read or -1 for error.
  */
-int ber_dectag(unsigned char *buf, int *class, int *tag, int *constructed)
+int MDF ber_dectag(unsigned char *buf, int *class, int *tag, int *constructed)
 {
     unsigned char *b = buf;
 
diff --git a/odr/dumpber.c b/odr/dumpber.c
index 3daba15..5b97245 100644
--- a/odr/dumpber.c
+++ b/odr/dumpber.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dumpber.c,v $
- * Revision 1.2  1995-06-27 13:20:51  quinn
+ * Revision 1.3  1995-09-27 15:02:57  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.2  1995/06/27  13:20:51  quinn
  * Fixed sign-clash. Non-fatal warning
  *
  * Revision 1.1  1995/06/19  12:38:45  quinn
@@ -108,7 +111,7 @@ static int do_dumpBER(FILE *f, char *buf, int len, int level)
     return b - buf;
 }
 
-int odr_dumpBER(FILE *f, char *buf, int len)
+int MDF odr_dumpBER(FILE *f, char *buf, int len)
 {
     return do_dumpBER(f, buf, len, 0);
 }
diff --git a/odr/odr.c b/odr/odr.c
index d007f1b..732f258 100644
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr.c,v $
- * Revision 1.15  1995-08-15 12:00:22  quinn
+ * Revision 1.16  1995-09-27 15:02:57  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.15  1995/08/15  12:00:22  quinn
  * Updated External
  *
  * Revision 1.14  1995/06/19  12:38:46  quinn
@@ -76,22 +79,22 @@ char *odr_errlist[] =
     "Length of constructed type different from sum of members"
 };
 
-void odr_perror(ODR o, char *message)
+void MDF odr_perror(ODR o, char *message)
 {
     fprintf(stderr, "%s: %s\n", message, odr_errlist[o->error]);
 }
 
-int odr_geterror(ODR o)
+int MDF odr_geterror(ODR o)
 {
     return o->error;
 }
 
-void odr_setprint(ODR o, FILE *file)
+void MDF odr_setprint(ODR o, FILE *file)
 {
     o->print = file;
 }
 
-ODR odr_createmem(int direction)
+ODR MDF odr_createmem(int direction)
 {
     struct odr *r;
 
@@ -109,7 +112,7 @@ ODR odr_createmem(int direction)
     return r;
 }
 
-void odr_reset(ODR o)
+void MDF odr_reset(ODR o)
 {
     o->error = ONONE;
     o->bp = o->buf;
@@ -125,7 +128,7 @@ void odr_reset(ODR o)
     o->choice_bias = -1;
 }
     
-void odr_destroy(ODR o)
+void MDF odr_destroy(ODR o)
 {
     odr_release_mem(o->mem);
     if (o->ecb.buf && o->ecb.can_grow)
@@ -135,7 +138,7 @@ void odr_destroy(ODR o)
     free(o);
 }
 
-void odr_setbuf(ODR o, char *buf, int len, int can_grow)
+void MDF odr_setbuf(ODR o, char *buf, int len, int can_grow)
 {
     o->buf = o->bp = (unsigned char *) buf;
     o->buflen = o->left = len;
@@ -146,7 +149,7 @@ void odr_setbuf(ODR o, char *buf, int len, int can_grow)
     o->ecb.size = len;
 }
 
-char *odr_getbuf(ODR o, int *len, int *size)
+char MDF *odr_getbuf(ODR o, int *len, int *size)
 {
     *len = o->ecb.top;
     if (size)
diff --git a/odr/odr_any.c b/odr/odr_any.c
index 0a42072..81edb96 100644
--- a/odr/odr_any.c
+++ b/odr/odr_any.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_any.c,v $
- * Revision 1.4  1995-05-16 08:50:50  quinn
+ * Revision 1.5  1995-09-27 15:02:58  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.4  1995/05/16  08:50:50  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.3  1995/03/17  10:17:46  quinn
@@ -26,7 +29,7 @@
  * does not work, and neither does the optional flag, unless the element
  * is the last in a sequence.
  */
-int odr_any(ODR o, Odr_any **p, int opt)
+int MDF odr_any(ODR o, Odr_any **p, int opt)
 {
     if (o->error)
     	return 0;
diff --git a/odr/odr_bit.c b/odr/odr_bit.c
index 94bc0a2..5deb9cd 100644
--- a/odr/odr_bit.c
+++ b/odr/odr_bit.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_bit.c,v $
- * Revision 1.8  1995-05-16 08:50:51  quinn
+ * Revision 1.9  1995-09-27 15:02:58  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.8  1995/05/16  08:50:51  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.7  1995/03/17  10:17:48  quinn
@@ -38,7 +41,7 @@
  * Top level bitstring string en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_bitstring(ODR o, Odr_bitmask **p, int opt)
+int MDF odr_bitstring(ODR o, Odr_bitmask **p, int opt)
 {
     int res, cons = 0;
 
diff --git a/odr/odr_bool.c b/odr/odr_bool.c
index 31fabad..b5ea387 100644
--- a/odr/odr_bool.c
+++ b/odr/odr_bool.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_bool.c,v $
- * Revision 1.6  1995-05-16 08:50:52  quinn
+ * Revision 1.7  1995-09-27 15:02:58  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.6  1995/05/16  08:50:52  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.5  1995/03/17  10:17:49  quinn
@@ -31,7 +34,7 @@
  * Top level boolean en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_bool(ODR o, int **p, int opt)
+int MDF odr_bool(ODR o, int **p, int opt)
 {
     int res, cons = 0;
 
diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 0d8fc65..945e4fe 100644
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_choice.c,v $
- * Revision 1.9  1995-08-15 12:00:23  quinn
+ * Revision 1.10  1995-09-27 15:02:58  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.9  1995/08/15  12:00:23  quinn
  * Updated External
  *
  * Revision 1.8  1995/06/19  17:01:51  quinn
@@ -35,7 +38,7 @@
 
 #include <odr.h>
 
-int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
+int MDF odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
 {
     int i, cl = -1, tg, cn, *which = whichp, bias = o->choice_bias;
 
@@ -94,7 +97,7 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
     return 0;
 }
 
-void odr_choice_bias(ODR o, int what)
+void MDF odr_choice_bias(ODR o, int what)
 {
     o->choice_bias = what;
 }
diff --git a/odr/odr_cons.c b/odr/odr_cons.c
index e61a359..4e54334 100644
--- a/odr/odr_cons.c
+++ b/odr/odr_cons.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_cons.c,v $
- * Revision 1.13  1995-08-15 11:16:39  quinn
+ * Revision 1.14  1995-09-27 15:02:58  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.13  1995/08/15  11:16:39  quinn
  * Fixed pretty-printers.
  * CV:e ----------------------------------------------------------------------
  * CV:e ----------------------------------------------------------------------
@@ -51,7 +54,7 @@
 #include <odr.h>
 #include <assert.h>
 
-int odr_constructed_begin(ODR o, void *p, int class, int tag)
+int MDF odr_constructed_begin(ODR o, void *p, int class, int tag)
 {
     int res;
     int cons = 1;
@@ -107,7 +110,7 @@ int odr_constructed_begin(ODR o, void *p, int class, int tag)
     return 1;
 }
 
-int odr_constructed_more(ODR o)
+int MDF odr_constructed_more(ODR o)
 {
     if (o->error)
     	return 0;
@@ -119,7 +122,7 @@ int odr_constructed_more(ODR o)
     	return (!(*o->bp == 0 && *(o->bp + 1) == 0));
 }
 
-int odr_constructed_end(ODR o)
+int MDF odr_constructed_end(ODR o)
 {
     int res;
     int pos;
diff --git a/odr/odr_int.c b/odr/odr_int.c
index 9ce0b44..37c08d6 100644
--- a/odr/odr_int.c
+++ b/odr/odr_int.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_int.c,v $
- * Revision 1.7  1995-05-16 08:50:54  quinn
+ * Revision 1.8  1995-09-27 15:02:59  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.7  1995/05/16  08:50:54  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.6  1995/03/17  10:17:51  quinn
@@ -33,7 +36,7 @@
  * Top level integer en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_integer(ODR o, int **p, int opt)
+int MDF odr_integer(ODR o, int **p, int opt)
 {
     int res, cons = 0;
 
diff --git a/odr/odr_mem.c b/odr/odr_mem.c
index 044b306..4437058 100644
--- a/odr/odr_mem.c
+++ b/odr/odr_mem.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_mem.c,v $
- * Revision 1.6  1995-08-21 09:10:41  quinn
+ * Revision 1.7  1995-09-27 15:02:59  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.6  1995/08/21  09:10:41  quinn
  * Smallish fixes to suppport new formats.
  *
  * Revision 1.5  1995/05/16  08:50:55  quinn
@@ -85,7 +88,7 @@ static odr_memblock *get_block(int size)
 /*
  * Return p to the global freelist.
  */
-void odr_release_mem(ODR_MEM p)
+void MDF odr_release_mem(ODR_MEM p)
 {
     odr_memblock *t;
 
@@ -100,7 +103,7 @@ void odr_release_mem(ODR_MEM p)
 /*
  * Extract the memory control block from o.
  */
-ODR_MEM odr_extract_mem(ODR o)
+ODR_MEM MDF odr_extract_mem(ODR o)
 {
     ODR_MEM r = o->mem;
 
@@ -108,7 +111,7 @@ ODR_MEM odr_extract_mem(ODR o)
     return r;
 }
 
-void *odr_malloc(ODR o, int size)
+void MDF *odr_malloc(ODR o, int size)
 {
     struct odr_memblock *p = o->mem;
     char *r;
@@ -130,7 +133,7 @@ void *odr_malloc(ODR o, int size)
     return r;
 }
 
-int odr_total(ODR o)
+int MDF odr_total(ODR o)
 {
     return o->mem ? o->mem->total : 0;
 }
@@ -138,7 +141,7 @@ int odr_total(ODR o)
 /* ---------- memory management for data encoding ----------*/
 
 
-int odr_grow_block(odr_ecblock *b, int min_bytes)
+int MDF odr_grow_block(odr_ecblock *b, int min_bytes)
 {
     int togrow;
 
@@ -160,7 +163,7 @@ int odr_grow_block(odr_ecblock *b, int min_bytes)
     return 0;
 }
 
-int odr_write(ODR o, unsigned char *buf, int bytes)
+int MDF odr_write(ODR o, unsigned char *buf, int bytes)
 {
     if (o->ecb.pos + bytes >= o->ecb.size && odr_grow_block(&o->ecb, bytes))
     {
@@ -174,7 +177,7 @@ int odr_write(ODR o, unsigned char *buf, int bytes)
     return 0;
 }
 
-int odr_seek(ODR o, int whence, int offset)
+int MDF odr_seek(ODR o, int whence, int offset)
 {
     if (whence == ODR_S_CUR)
     	offset += o->ecb.pos;
diff --git a/odr/odr_null.c b/odr/odr_null.c
index b4fbf64..ac26999 100644
--- a/odr/odr_null.c
+++ b/odr/odr_null.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_null.c,v $
- * Revision 1.6  1995-05-22 11:32:03  quinn
+ * Revision 1.7  1995-09-27 15:02:59  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.6  1995/05/22  11:32:03  quinn
  * Fixing Interface to odr_null.
  *
  * Revision 1.5  1995/05/16  08:50:56  quinn
@@ -30,7 +33,7 @@
  * Top level null en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_null(ODR o, Odr_null **p, int opt)
+int MDF odr_null(ODR o, Odr_null **p, int opt)
 {
     int res, cons = 0;
 
diff --git a/odr/odr_oct.c b/odr/odr_oct.c
index c1242d2..d5d2dab 100644
--- a/odr/odr_oct.c
+++ b/odr/odr_oct.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oct.c,v $
- * Revision 1.9  1995-05-16 08:50:56  quinn
+ * Revision 1.10  1995-09-27 15:02:59  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.9  1995/05/16  08:50:56  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.8  1995/03/17  10:17:54  quinn
@@ -39,7 +42,7 @@
  * Top level octet string en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_octetstring(ODR o, Odr_oct **p, int opt)
+int MDF odr_octetstring(ODR o, Odr_oct **p, int opt)
 {
     int res, cons = 0;
 
@@ -75,7 +78,7 @@ int odr_octetstring(ODR o, Odr_oct **p, int opt)
 /*
  * Friendlier interface to octetstring.
  */
-int odr_cstring(ODR o, char **p, int opt)
+int MDF odr_cstring(ODR o, char **p, int opt)
 {
     int cons = 0, res;
     Odr_oct *t;
diff --git a/odr/odr_oid.c b/odr/odr_oid.c
index f6d005d..2072903 100644
--- a/odr/odr_oid.c
+++ b/odr/odr_oid.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oid.c,v $
- * Revision 1.10  1995-05-29 08:11:44  quinn
+ * Revision 1.11  1995-09-27 15:03:00  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.10  1995/05/29  08:11:44  quinn
  * Moved oid from odr/asn to util.
  *
  * Revision 1.9  1995/05/16  08:50:57  quinn
@@ -44,7 +47,7 @@
  * Top level oid en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_oid(ODR o, Odr_oid **p, int opt)
+int MDF odr_oid(ODR o, Odr_oid **p, int opt)
 {
     int res, cons = 0;
 
diff --git a/odr/odr_seq.c b/odr/odr_seq.c
index 7607920..8ab4e03 100644
--- a/odr/odr_seq.c
+++ b/odr/odr_seq.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_seq.c,v $
- * Revision 1.14  1995-08-15 11:16:39  quinn
+ * Revision 1.15  1995-09-27 15:03:00  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.14  1995/08/15  11:16:39  quinn
  * Fixed pretty-printers.
  * CV:e ----------------------------------------------------------------------
  * CV:e ----------------------------------------------------------------------
@@ -53,7 +56,7 @@
 #include <odr.h>
 #include <assert.h>
 
-int odr_sequence_begin(ODR o, void *p, int size)
+int MDF odr_sequence_begin(ODR o, void *p, int size)
 {
     char **pp = (char**) p;
 
@@ -76,7 +79,7 @@ int odr_sequence_begin(ODR o, void *p, int size)
     	return 0;
 }
 
-int odr_sequence_end(ODR o)
+int MDF odr_sequence_end(ODR o)
 {
     return odr_constructed_end(o);    
 }
@@ -86,7 +89,7 @@ int odr_sequence_more(ODR o)
     return odr_constructed_more(o);
 }
 
-int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
+int MDF odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
 {
     char ***pp = (char***) p;  /* for dereferencing */
     char **tmp = 0;
diff --git a/odr/odr_tag.c b/odr/odr_tag.c
index 4c5a2b7..ccbd780 100644
--- a/odr/odr_tag.c
+++ b/odr/odr_tag.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_tag.c,v $
- * Revision 1.3  1995-05-16 08:51:00  quinn
+ * Revision 1.4  1995-09-27 15:03:00  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.3  1995/05/16  08:51:00  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.2  1995/03/08  12:12:31  quinn
@@ -17,7 +20,7 @@
 
 #include <odr.h>
 
-int odr_implicit_settag(ODR o, int class, int tag)
+int MDF odr_implicit_settag(ODR o, int class, int tag)
 {
     if (o->error)
     	return 0;
diff --git a/odr/odr_use.c b/odr/odr_use.c
index ec29359..bf6a55a 100644
--- a/odr/odr_use.c
+++ b/odr/odr_use.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_use.c,v $
- * Revision 1.5  1995-08-10 08:54:47  quinn
+ * Revision 1.6  1995-09-27 15:03:00  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.5  1995/08/10  08:54:47  quinn
  * Added Explain.
  *
  * Revision 1.4  1995/06/16  13:16:12  quinn
@@ -24,7 +27,7 @@
 #include <odr.h>
 #include <odr_use.h>
 
-int odr_external(ODR o, Odr_external **p, int opt)
+int MDF odr_external(ODR o, Odr_external **p, int opt)
 {
     Odr_external *pp;
     static Odr_arm arm[] =
@@ -47,7 +50,7 @@ int odr_external(ODR o, Odr_external **p, int opt)
 	odr_sequence_end(o);
 }
 
-int odr_visiblestring(ODR o, char **p, int opt)
+int MDF odr_visiblestring(ODR o, char **p, int opt)
 {
     return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_VISIBLESTRING,
     	opt);
@@ -57,19 +60,19 @@ int 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 odr_generalstring(ODR o, char **p, int opt)
+int MDF odr_generalstring(ODR o, char **p, int opt)
 {
     return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GENERALSTRING,
     	opt);
 }    
 
-int odr_graphicstring(ODR o, char **p, int opt)
+int MDF odr_graphicstring(ODR o, char **p, int opt)
 {
     return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GRAPHICSTRING,
     	opt);
 }    
 
-int odr_generalizedtime(ODR o, char **p, int opt)
+int MDF odr_generalizedtime(ODR o, char **p, int opt)
 {
     return odr_implicit(o, odr_cstring, p, ODR_UNIVERSAL, ODR_GENERALIZEDTIME,
     	opt);
diff --git a/odr/odr_util.c b/odr/odr_util.c
index 7a07775..a25d1ad 100644
--- a/odr/odr_util.c
+++ b/odr/odr_util.c
@@ -2,7 +2,7 @@
 #include <odr.h>
 #include <oid.h>
 
-char *odr_indent(ODR o)
+char MDF *odr_indent(ODR o)
 {
     static char buf[512];
     int i = o->indent;
@@ -14,7 +14,7 @@ char *odr_indent(ODR o)
     return buf;
 }
 
-int odp_more_chunks(ODR o, unsigned char *base, int len)
+int MDF odp_more_chunks(ODR o, unsigned char *base, int len)
 {
     if (!len)
     	return 0;
@@ -33,7 +33,7 @@ int odp_more_chunks(ODR o, unsigned char *base, int len)
         return o->bp - base < len;
 }
 
-Odr_oid *odr_oiddup(ODR odr, Odr_oid *o)
+Odr_oid MDF *odr_oiddup(ODR odr, Odr_oid *o)
 {
     Odr_oid *r;
 
diff --git a/server/statserv.c b/server/statserv.c
index f7b6549..aa68bc1 100644
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: statserv.c,v $
- * Revision 1.26  1995-08-29 14:44:51  quinn
+ * Revision 1.27  1995-09-27 15:03:02  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.26  1995/08/29  14:44:51  quinn
  * Reset timeouts.
  *
  * Revision 1.25  1995/08/29  11:18:02  quinn
@@ -331,7 +334,7 @@ static void catchchld(int num)
     signal(SIGCHLD, catchchld);
 }
 
-statserv_options_block *statserv_getcontrol(void)
+statserv_options_block MDF *statserv_getcontrol(void)
 {
     static statserv_options_block cb;
 
@@ -339,12 +342,12 @@ statserv_options_block *statserv_getcontrol(void)
     return &cb;
 }
 
-void statserv_setcontrol(statserv_options_block *block)
+void MDF statserv_setcontrol(statserv_options_block *block)
 {
     memcpy(&control_block, block, sizeof(*block));
 }
 
-int statserv_main(int argc, char **argv)
+int MDF statserv_main(int argc, char **argv)
 {
     int ret, listeners = 0;
     char *arg;
diff --git a/util/dmalloc.c b/util/dmalloc.c
index cbe190c..a5a5bda 100644
--- a/util/dmalloc.c
+++ b/util/dmalloc.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dmalloc.c,v $
- * Revision 1.5  1995-05-16 08:51:10  quinn
+ * Revision 1.6  1995-09-27 15:03:02  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.5  1995/05/16  08:51:10  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.4  1995/05/15  13:25:13  quinn
@@ -31,7 +34,7 @@ static const unsigned char head[] = {44, 33, 22, 11};
 static const unsigned char tail[] = {11, 22, 33, 44};
 static const unsigned char freed[] = {99, 99, 99, 99};
 
-void *d_malloc(char *file, int line, int nbytes)
+void MDF *d_malloc(char *file, int line, int nbytes)
 {
     char *res;
     int long len;
@@ -48,7 +51,7 @@ void *d_malloc(char *file, int line, int nbytes)
     return res;
 }
 
-void d_free(char *file, int line, char *ptr)
+void MDF d_free(char *file, int line, char *ptr)
 {
     long len;
 
@@ -64,7 +67,7 @@ void d_free(char *file, int line, char *ptr)
     return;
 }
 
-void *d_realloc(char *file, int line, char *ptr, int nbytes)
+void MDF *d_realloc(char *file, int line, char *ptr, int nbytes)
 {
     long len, nlen = nbytes;
     char *p = ptr;
diff --git a/util/log.c b/util/log.c
index ea026f8..76eaf1b 100644
--- a/util/log.c
+++ b/util/log.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: log.c,v $
- * Revision 1.7  1995-06-19 12:40:18  quinn
+ * Revision 1.8  1995-09-27 15:03:02  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.7  1995/06/19  12:40:18  quinn
  * Added log_file()
  *
  * Revision 1.6  1995/06/15  15:45:03  quinn
@@ -92,12 +95,12 @@ char *strerror(int n)
 
 #endif
 
-FILE *log_file(void)
+FILE MDF *log_file(void)
 {
     return l_file;
 }
 
-void log_init(int level, const char *prefix, const char *name)
+void MDF log_init(int level, const char *prefix, const char *name)
 {
     l_level = level;
     if (prefix && *prefix)
@@ -109,7 +112,7 @@ void log_init(int level, const char *prefix, const char *name)
     setvbuf(l_file, 0, _IONBF, 0);
 }
 
-void logf(int level, const char *fmt, ...)
+void MDF logf(int level, const char *fmt, ...)
 {
     va_list ap;
     char buf[4096], flags[1024];
@@ -141,7 +144,7 @@ void logf(int level, const char *fmt, ...)
     fflush(l_file);
 }
 
-int log_mask_str (const char *str)
+int MDF log_mask_str (const char *str)
 {
     const char *p;
     int i, level = LOG_DEFAULT_LEVEL;
diff --git a/util/marcdisp.c b/util/marcdisp.c
index 6ad66ab..88f400e 100644
--- a/util/marcdisp.c
+++ b/util/marcdisp.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: marcdisp.c,v $
- * Revision 1.2  1995-05-16 08:51:12  quinn
+ * Revision 1.3  1995-09-27 15:03:03  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.2  1995/05/16  08:51:12  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.1  1995/04/10  10:28:46  quinn
@@ -34,7 +37,7 @@ int atoi_n (const char *buf, int len)
     return val;
 }
 
-int marc_display (const char *buf, FILE *outf)
+int MDF marc_display (const char *buf, FILE *outf)
 {
     int entry_p;
     int record_length;
diff --git a/util/oid.c b/util/oid.c
index 6f3927c..c44ce71 100644
--- a/util/oid.c
+++ b/util/oid.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: oid.c,v $
- * Revision 1.3  1995-09-12 11:32:06  quinn
+ * Revision 1.4  1995-09-27 15:03:03  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.3  1995/09/12  11:32:06  quinn
  * Added a looker-upper by name.
  *
  * Revision 1.2  1995/08/21  09:11:16  quinn
@@ -158,19 +161,19 @@ static oident oids[] =
 
 /* OID utilities */
 
-void oid_oidcpy(int *t, int *s)
+void MDF oid_oidcpy(int *t, int *s)
 {
     while ((*(t++) = *(s++)) > -1);
 }
 
-void oid_oidcat(int *t, int *s)
+void MDF oid_oidcat(int *t, int *s)
 {
     while (*t > -1)
     	t++;
     while ((*(t++) = *(s++)) > -1);
 }
 
-int oid_oidcmp(int *o1, int *o2)
+int MDF oid_oidcmp(int *o1, int *o2)
 {
     while (*o1 == *o2 && *o1 > -1)
     {
@@ -185,7 +188,7 @@ int oid_oidcmp(int *o1, int *o2)
     	return -1;
 }
 
-int oid_oidlen(int *o)
+int MDF oid_oidlen(int *o)
 {
     int len = 0;
 
@@ -205,7 +208,7 @@ static int match_prefix(int *look, int *prefix)
     return 0;
 }
 
-struct oident *oid_getentbyoid(int *o)
+struct MDF oident *oid_getentbyoid(int *o)
 {
     enum oid_proto proto;
     int prelen;
@@ -229,7 +232,7 @@ struct oident *oid_getentbyoid(int *o)
 /*
  * To query, fill out proto, class, and value of the ent parameter.
  */
-int *oid_getoidbyent(struct oident *ent)
+int MDF *oid_getoidbyent(struct oident *ent)
 {
     struct oident *p;
     static int ret[OID_SIZE];
@@ -251,7 +254,7 @@ int *oid_getoidbyent(struct oident *ent)
     return 0;
 }
 
-oid_value oid_getvalbyname(char *name)
+oid_value MDF oid_getvalbyname(char *name)
 {
     struct oident *p;
 
diff --git a/util/options.c b/util/options.c
index 8a69e6c..6246b23 100644
--- a/util/options.c
+++ b/util/options.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: options.c,v $
- * Revision 1.2  1995-05-16 08:51:13  quinn
+ * Revision 1.3  1995-09-27 15:03:03  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.2  1995/05/16  08:51:13  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.1  1995/03/27  08:35:18  quinn
@@ -25,7 +28,7 @@
 static int arg_no = 1;
 static int arg_off = 0;
 
-int options (const char *desc, char **argv, int argc, char **arg)
+int MDF options (const char *desc, char **argv, int argc, char **arg)
 {
     int ch, i = 0;
     
diff --git a/util/pquery.c b/util/pquery.c
index 1df0a8b..f842788 100644
--- a/util/pquery.c
+++ b/util/pquery.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: pquery.c,v $
- * Revision 1.5  1995-06-15 12:31:02  quinn
+ * Revision 1.6  1995-09-27 15:03:03  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.5  1995/06/15  12:31:02  quinn
  * *** empty log message ***
  *
  * Revision 1.4  1995/06/15  07:45:19  quinn
@@ -245,7 +248,7 @@ static Z_RPNStructure *rpn_structure (ODR o, int num_attr, int max_attr,
     return sz;
 }
 
-Z_RPNQuery *p_query_rpn (ODR o, const char *qbuf)
+Z_RPNQuery MDF *p_query_rpn (ODR o, const char *qbuf)
 {
     Z_RPNQuery *zq;
     int attr_array[1024];
@@ -259,7 +262,7 @@ Z_RPNQuery *p_query_rpn (ODR o, const char *qbuf)
     return zq;
 }
 
-Z_AttributesPlusTerm *p_query_scan (ODR o, const char *qbuf)
+Z_AttributesPlusTerm MDF *p_query_scan (ODR o, const char *qbuf)
 {
     int attr_list[1024];
     int num_attr = 0;
diff --git a/util/yaz-ccl.c b/util/yaz-ccl.c
index a801874..095bf4b 100644
--- a/util/yaz-ccl.c
+++ b/util/yaz-ccl.c
@@ -141,7 +141,7 @@ static Z_RPNStructure *ccl_rpn_structure (struct ccl_rpn_node *p)
     return zs;
 }
 
-Z_RPNQuery *ccl_rpn_query (struct ccl_rpn_node *p)
+Z_RPNQuery MDF *ccl_rpn_query (struct ccl_rpn_node *p)
 {
     Z_RPNQuery *zq;
 
@@ -152,7 +152,7 @@ Z_RPNQuery *ccl_rpn_query (struct ccl_rpn_node *p)
     return zq;
 }
 
-Z_AttributesPlusTerm *ccl_scan_query (struct ccl_rpn_node *p)
+Z_AttributesPlusTerm MDF *ccl_scan_query (struct ccl_rpn_node *p)
 {
     if (p->kind != CCL_RPN_TERM)
         return NULL;