Windows build is broken

[db4]

Commit e79232c just destroyed it completely. Here are the fixes that make it compile again but I'm no expert in lwt I may do something incorrect.

diff --git a/src/lTerm_windows_stubs.c b/src/lTerm_windows_stubs.c
index b977dba..d818ec9 100644
--- a/src/lTerm_windows_stubs.c
+++ b/src/lTerm_windows_stubs.c
@@ -16,7 +16,6 @@
 
 #if defined(_WIN32) || defined(_WIN64)
 
-#include <windows.h>
 #include <lwt_unix.h>
 
 /* +-----------------------------------------------------------------+
@@ -140,24 +139,16 @@ static void worker_read_console_input(struct job_read_console_input *job)
   }
 }
 
-CAMLprim value lt_windows_read_console_input_job(value val_fd)
+static value result_read_console_input(struct job_read_console_input *job)
 {
-  LWT_UNIX_INIT_JOB(job, read_console_input, 0);
-  job->handle = Handle_val(val_fd);
-  job->error_code = 0;
-  CAMLreturn(lwt_unix_alloc_job(&(job->job)));
-}
-
-static value result_read_console_input_result(struct job_read_console_input *job)
-{
-  INPUT_RECORD input;
+  INPUT_RECORD * input;
   DWORD cks, bs;
   WORD code;
   int i;
   CAMLparam0();
   CAMLlocal3(result, x, y);
   int error_code = job->error_code;
-  input = job->input;
+  input = &(job->input);
   lwt_unix_free_job(&job->job);
   if (error_code) {
     win32_maperr(error_code);
@@ -212,6 +203,16 @@ static value result_read_console_input_result(struct job_read_console_input *job
   CAMLreturn(Val_int(0));
 }
 
+CAMLprim value lt_windows_read_console_input_job(value val_fd)
+{
+  CAMLparam0();
+  LWT_UNIX_INIT_JOB(job, read_console_input, 0);
+  job->handle = Handle_val(val_fd);
+  job->error_code = 0;
+  return lwt_unix_alloc_job(&(job->job));
+  CAMLreturn(lwt_unix_alloc_job(&(job->job)));
+}
+
 /* +-----------------------------------------------------------------+
    | Console informations                                            |
    +-----------------------------------------------------------------+ */

[pmetzger]

Hi there! Sorry for not replying earlier. I recommend that you do a pull request, rather than submitting patches inside a problem report. We can then consider merging it.

[pmetzger]

Oh, also, if you could explain (for the benefit of those of us who don't know the Windows platform well) what broke exactly and how this fixes it, it will make it easier to evaluate the pull request.

[kandu]

Thanks, @db4. I've read lwt_unix.h and other related source code(win32unix/unixsupport.c etc..) and didn't find any problem from your patch except one typo.

+  return lwt_unix_alloc_job(&(job->job));
+  CAMLreturn(lwt_unix_alloc_job(&(job->job)));

here we can just keep the second return statement.

[db4]

+  return lwt_unix_alloc_job(&(job->job));
+  CAMLreturn(lwt_unix_alloc_job(&(job->job)));

here we can just keep the second return statement.

Indeed. Sorry for that.