Changeset 10385

Timestamp:

2005-08-02T09:42:21+12:00 (19 years ago)

Author:

kjdon

Message:

a few changes to get it compiling on windows

Location:

trunk/gsdl/packages/d2m

Files:

• MARC2709.c (modified) (1 diff)
• MARCtidy.c (modified) (1 diff)
• d2m.h (modified) (1 diff)
• d2m4gs.h (modified) (2 diffs)
• usMARC.c (modified) (1 diff)
• util.c (modified) (2 diffs)

trunk/gsdl/packages/d2m/MARC2709.c

@@ -210 +210 @@
             data++;  
 
+      subcode = ' ';
       nextsubcode = ' ';
 

trunk/gsdl/packages/d2m/MARCtidy.c

@@ -22 +22 @@
 #include <string.h>
 #include <ctype.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include "d2m.h"
 

trunk/gsdl/packages/d2m/d2m.h

@@ -63 +63 @@
             };
 
-extern int write_field(char *i, FILE *of, int l, int n, int s);
+extern void write_field(char *i, FILE *of, int l, int n, int s);
 extern int write_trace(char *n, FILE *of);
 extern struct metatag *dc_parse(char *b); 

trunk/gsdl/packages/d2m/d2m4gs.h

@@ -1 +1 @@
 #ifndef D2M4GSH
 #define D2M4GSH
+
+#include <string.h>
 
 #ifdef __cplusplus
@@ -10 +12 @@
 
 void MARCtidy(struct marcrec *mrec, char *buf, int format);
-int usMARC(struct metatag *mt, struct marcrec *mr);
+void usMARC(struct metatag *mt, struct marcrec *mr);
 char *MARC2709(char *record, int last, int first, char recstatus, 
            char rectype, char biblevel);

trunk/gsdl/packages/d2m/usMARC.c

@@ -11 +11 @@
 
 
-int usMARC(struct metatag *mt, struct marcrec *mr)
+void usMARC(struct metatag *mt, struct marcrec *mr)
 {
   char pre[64], title_tag[4];

trunk/gsdl/packages/d2m/util.c

@@ -20 +20 @@
 /* ------------------------------------------------------------------- */
 
-int write_field(char *l, FILE *of, int linel, int llen, int slen)
+void write_field(char *l, FILE *of, int linel, int llen, int slen)
 {
   char pre[64], line[256], *p, *q, *n;
@@ -274 +274 @@
   fclose(tf);
   remove(tracefile);  
+  return 1;
 }