From a5cc2761cdf3455ceb49b73bf3d0933adf3e1451 Mon Sep 17 00:00:00 2001
From: Sebastian Hammer <quinn@indexdata.com>
Date: Mon, 2 Oct 1995 15:05:26 +0000
Subject: [PATCH] Added a few fields.

---
 include/recctrl.h |   30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/include/recctrl.h b/include/recctrl.h
index 717a61d..d7c4a58 100644
--- a/include/recctrl.h
+++ b/include/recctrl.h
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recctrl.h,v $
- * Revision 1.5  1995-10-02 14:55:52  quinn
+ * Revision 1.6  1995-10-02 15:05:26  quinn
+ * Added a few fields.
+ *
+ * Revision 1.5  1995/10/02  14:55:52  quinn
  * *** empty log message ***
  *
  * Revision 1.4  1995/09/27  16:17:29  adam
@@ -44,23 +47,10 @@ typedef struct {
 
 /* Extract record control */
 struct recExtractCtrl {
-<<<<<<< recctrl.h
-    int inf;
-    char *subType;
-    void (*init)(RecWord *p);
-    void (*add)(const RecWord *p);
-||||||| 1.4
     FILE *inf;
     char *subType;
     void (*init)(RecWord *p);
     void (*add)(const RecWord *p);
-=======
-    /* input parameters ... */
-    FILE *inf;                         /* Extract from this file */
-    char *subType;                     /* Sub type - may be NULL */
-    void (*init)(RecWord *p);          /* Init of word spec */
-    void (*add)(const RecWord *p);     /* Addition of a single word */
->>>>>>> /tmp/T4a00136
 };
 
 /* Retrieve record control */
@@ -71,24 +61,12 @@ struct recRetrieveCtrl {
     int       (*readf)(int fd, char *buf, size_t count);
     oid_value  input_format;           /* Preferred record syntax */
     
-<<<<<<< recctrl.h
     /* response */
     oid_value  output_format;
     void       *rec_buf;
     size_t     rec_len;
     int diagnostic;
     char *message;
-||||||| 1.4
-    /* response */
-    oid_value  output_format;
-    void       *rec_buf;
-    size_t     rec_len;
-=======
-    /* output parameters ... */
-    oid_value  output_format;          /* Record syntax of returned record */
-    void       *rec_buf;               /* Record buffer */
-    size_t     rec_len;                /* Length of record */
->>>>>>> /tmp/T4a00136
 };
 
 typedef struct recType
-- 
1.7.10.4