X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fproto.h;h=354d1369dcda886c3df6168ed35ad3ca23822f47;hb=0d9eca26da6a9369bb00efd75a9472380526f547;hp=b2e095a69bae9caa21be3b7ee3f765fe2b70034c;hpb=84b60b9a8d2052540541726390fde416c59e1f40;p=yaz-moved-to-github.git

diff --git a/include/proto.h b/include/proto.h
index b2e095a..354d136 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -24,7 +24,14 @@
  * OF THIS SOFTWARE.
  *
  * $Log: proto.h,v $
- * Revision 1.42  1998-03-20 14:46:06  adam
+ * Revision 1.44  1998-05-18 10:14:08  adam
+ * Minor change - removed 'dead' definitions.
+ *
+ * Revision 1.43  1998/03/31 11:07:45  adam
+ * Furhter work on UNIverse resource report.
+ * Added Extended Services handling in frontend server.
+ *
+ * Revision 1.42  1998/03/20 14:46:06  adam
  * Added UNIverse Resource Reports.
  *
  * Revision 1.41  1998/02/10 15:31:52  adam
@@ -874,8 +881,6 @@ typedef struct Z_AlternativeTerm
     Z_AttributesPlusTerm **terms;
 } Z_AlternativeTerm;
 
-#if 1
-
 typedef struct Z_ByDatabase
 {
     char *db;
@@ -915,31 +920,6 @@ typedef struct Z_OccurrenceByAttributes
     Z_OccurrenceByAttributesElem **elements;
 } Z_OccurrenceByAttributes;
 
-#else
-
-/*
- * Old, incomplete definition of OccurrenceByAttributes.
- */
-
-typedef struct Z_OccurrenceByAttributes
-{
-    Z_AttributeList *attributes;
-#if 0
-    int which;
-#define Z_OByAtt_global 0
-#define Z_ObyAtt_byDatabase 1
-    union
-    {
-#endif
-    	int *global;
-#if 0
-	/* Z_ByDatabase *byDatabase; */
-    } u;
-#endif
-} Z_OccurrenceByAttributes;
-
-#endif
-
 typedef struct Z_TermInfo
 {
     Z_Term *term;
@@ -1388,8 +1368,8 @@ YAZ_EXPORT int z_Query(ODR o, Z_Query **p, int opt);
 #include <prt-esp.h>
 #include <prt-add.h>
 
-#include <prt-ext.h>
 #include <prt-dat.h>
 #include <prt-univ.h>
+#include <prt-ext.h>
 
 #endif