Module Name: src
Committed By: apb
Date: Fri Aug 8 19:29:34 UTC 2014
Modified Files:
src/external/bsd/ekermit/dist: kermit.h platform.h
Log Message:
Make ekermit compile on NetBSD:
* Add several #includes of standard headers in platform.h.
* #undef X_OK in platform.h. It's defined in the standard <access.h>,
but also used in the local "kermit.h" for a differentpurpose.
* Declare {struct k_data}.dbf as a function returning void, not int,
to match the way it's used.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ekermit/dist/kermit.h \
src/external/bsd/ekermit/dist/platform.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ekermit/dist/kermit.h
diff -u src/external/bsd/ekermit/dist/kermit.h:1.1.1.1 src/external/bsd/ekermit/dist/kermit.h:1.2
--- src/external/bsd/ekermit/dist/kermit.h:1.1.1.1 Fri Aug 8 19:20:39 2014
+++ src/external/bsd/ekermit/dist/kermit.h Fri Aug 8 19:29:34 2014
@@ -383,7 +383,7 @@ struct k_data {
int (*readf)(struct k_data *); /* read-file function */
int (*writef)(struct k_data *,UCHAR *, int); /* write-file function */
int (*closef)(struct k_data *,UCHAR,int); /* close-file function */
- int (*dbf)(int,UCHAR *,UCHAR *,long); /* debug function */
+ void (*dbf)(int,UCHAR *,UCHAR *,long); /* debug function */
UCHAR * zinbuf; /* Input file buffer itself */
int zincnt; /* Input buffer position */
int zinlen; /* Length of input file buffer */
Index: src/external/bsd/ekermit/dist/platform.h
diff -u src/external/bsd/ekermit/dist/platform.h:1.1.1.1 src/external/bsd/ekermit/dist/platform.h:1.2
--- src/external/bsd/ekermit/dist/platform.h:1.1.1.1 Fri Aug 8 19:20:38 2014
+++ src/external/bsd/ekermit/dist/platform.h Fri Aug 8 19:29:34 2014
@@ -1,8 +1,14 @@
/* Unix platform.h for EK */
+#include <ctype.h>
+#include <errno.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
#include <sys/stat.h>
+#undef X_OK /* namespace collision between kermit.h and unistd.h */
+
#ifndef IBUFLEN
#define IBUFLEN 4096 /* File input buffer size */
#endif /* IBUFLEN */
