Skip to content

Commit 29d35e4

Browse files
committed
Misc changes to get new Nyquist to build
1 parent 6181f40 commit 29d35e4

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

lib-src/libnyquist/nyquist/cmt/cmtio.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#define NOCHAR -2
22

3-
int IOinputfd;
4-
int IOnochar;
3+
extern int IOinputfd;
4+
extern int IOnochar;
55

66
int IOsetup(int inputfd);
77
int IOcleanup(void);

lib-src/libnyquist/nyquist/cmt/userio.c

+4
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,10 @@ extern int debug;
153153
#include "xlisp.h"
154154
#endif
155155

156+
int IOinputfd; /* input file descriptor (usually 0) */
157+
158+
int IOnochar; /* Value to be returned by IOgetchar()
159+
where there is no input to be had */
156160

157161
/****************************************************************************
158162
*

lib-src/libnyquist/nyquist/nyqsrc/seqfnint.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ LVAL xlc_seq_get(void)
185185
}
186186

187187

188+
#include "seqmwrite.h"
189+
188190
/* xlc_seq_write_smf -- interface to C routine seq_xlwrite_smf */
189191
/**/
190192
LVAL xlc_seq_write_smf(void)
@@ -213,8 +215,6 @@ LVAL xlc_seq_read_smf(void)
213215
}
214216

215217

216-
#include "seqmwrite.h"
217-
218218
#include "seqread.h"
219219

220220
/* xlc_seq_read -- interface to C routine seq_read */

lib-src/libnyquist/nyquist/sys/unix/io.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
#include <sgtty.h>
1717
#include "cext.h"
1818

19-
int IOinputfd; /* input file descriptor (usually 0) */
19+
extern int IOinputfd; /* input file descriptor (usually 0) */
2020

21-
int IOnochar; /* Value to be returned by IOgetchar()
22-
where there is no input to be had */
21+
extern int IOnochar; /* Value to be returned by IOgetchar()
22+
where there is no input to be had */
2323

2424
static struct sgttyb IOoldmodes, IOcurrentmodes;
2525
/* Initial and current tty modes */

0 commit comments

Comments
 (0)