Skip to content

Commit afbe3a5

Browse files
committed
fix windows build (@db4, #72)
1 parent 17a6277 commit afbe3a5

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

src/lTerm_windows_stubs.c

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#if defined(_WIN32) || defined(_WIN64)
1818

19-
#include <windows.h>
2019
#include <lwt_unix.h>
2120

2221
/* +-----------------------------------------------------------------+
@@ -140,24 +139,16 @@ static void worker_read_console_input(struct job_read_console_input *job)
140139
}
141140
}
142141

143-
CAMLprim value lt_windows_read_console_input_job(value val_fd)
142+
static value result_read_console_input(struct job_read_console_input *job)
144143
{
145-
LWT_UNIX_INIT_JOB(job, read_console_input, 0);
146-
job->handle = Handle_val(val_fd);
147-
job->error_code = 0;
148-
CAMLreturn(lwt_unix_alloc_job(&(job->job)));
149-
}
150-
151-
static value result_read_console_input_result(struct job_read_console_input *job)
152-
{
153-
INPUT_RECORD input;
144+
INPUT_RECORD * input;
154145
DWORD cks, bs;
155146
WORD code;
156147
int i;
157148
CAMLparam0();
158149
CAMLlocal3(result, x, y);
159150
int error_code = job->error_code;
160-
input = job->input;
151+
input = &(job->input);
161152
lwt_unix_free_job(&job->job);
162153
if (error_code) {
163154
win32_maperr(error_code);
@@ -212,6 +203,16 @@ static value result_read_console_input_result(struct job_read_console_input *job
212203
CAMLreturn(Val_int(0));
213204
}
214205

206+
CAMLprim value lt_windows_read_console_input_job(value val_fd)
207+
{
208+
CAMLparam0();
209+
LWT_UNIX_INIT_JOB(job, read_console_input, 0);
210+
job->handle = Handle_val(val_fd);
211+
job->error_code = 0;
212+
return lwt_unix_alloc_job(&(job->job));
213+
CAMLreturn(lwt_unix_alloc_job(&(job->job)));
214+
}
215+
215216
/* +-----------------------------------------------------------------+
216217
| Console informations |
217218
+-----------------------------------------------------------------+ */

0 commit comments

Comments
 (0)