main.c: move win32 main() quirks to main-win32.h

Also drop unnecessary includes.

Makefile.am

@@ -7,7 +7,7 @@ LIBJQ_INCS = src/builtin.h src/bytecode.h src/compile.h                 \
         src/linker.h src/locfile.h src/opcode_list.h src/parser.y       \
         src/util.h src/decNumber/decContext.h src/decNumber/decNumber.h \
         src/decNumber/decNumberLocal.h src/jv_dtoa_tsd.h src/jv_thread.h \
-        src/jv_private.h src/math-macos.h
+        src/jv_private.h src/math-macos.h src/main-win32.h
 
 LIBJQ_SRC = src/builtin.c src/bytecode.c src/compile.c src/execute.c    \
         src/jq_test.c src/jv.c src/jv_alloc.c src/jv_aux.c              \

src/main-win32.h

@@ -0,0 +1,28 @@
+#ifndef MAIN_WIN32_H
+#define MAIN_WIN32_H
+
+#ifdef WIN32
+#include <stringapiset.h>
+#include <wchar.h>
+
+#define DEFINE_MAIN(ARGC, ARGV) \
+  int umain(ARGC, ARGV); \
+  int wmain(int argc, wchar_t* wargv[]) { \
+    size_t arg_sz; \
+    char **argv = alloca(argc * sizeof(wchar_t*)); \
+    for (int i = 0; i < argc; i++) { \
+      argv[i] = alloca((arg_sz = WideCharToMultiByte(CP_UTF8, \
+                                                     0, \
+                                                     wargv[i], \
+                                                     -1, 0, 0, 0, 0))); \
+      WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, argv[i], arg_sz, 0, 0); \
+    } \
+    return umain(argc, argv); \
+  } \
+  int umain(ARGC, ARGV)
+#else
+#define DEFINE_MAIN(ARGC, ARGV) \
+  int main(ARGC, ARGV)
+#endif
+
+#endif

src/main.c

@@ -11,13 +11,8 @@
 #include <unistd.h>
 
 #ifdef WIN32
-#include <windows.h>
 #include <io.h>
 #include <fcntl.h>
-#include <processenv.h>
-#include <shellapi.h>
-#include <wchar.h>
-#include <wtypes.h>
 extern void jv_tsd_dtoa_ctx_init();
 #endif
 
@@ -37,6 +32,7 @@ extern void jv_tsd_dtoa_ctx_init();
 #include "util.h"
 #include "src/version.h"
 #include "src/config_opts.inc"
+#include "main-win32.h"
 
 int jq_testsuite(jv lib_dirs, int verbose, int argc, char* argv[]);
 
@@ -274,26 +270,7 @@ static void stderr_cb(void *data, jv input) {
   jv_free(input);
 }
 
-#ifdef WIN32
-int umain(int argc, char* argv[]);
-
-int wmain(int argc, wchar_t* wargv[]) {
-  size_t arg_sz;
-  char **argv = alloca(argc * sizeof(wchar_t*));
-  for (int i = 0; i < argc; i++) {
-    argv[i] = alloca((arg_sz = WideCharToMultiByte(CP_UTF8,
-                                                   0,
-                                                   wargv[i],
-                                                   -1, 0, 0, 0, 0)));
-    WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, argv[i], arg_sz, 0, 0);
-  }
-  return umain(argc, argv);
-}
-
-int umain(int argc, char* argv[]) {
-#else /*}*/
-int main(int argc, char* argv[]) {
-#endif
+DEFINE_MAIN(int argc, char *argv[]) {
   jq_state *jq = NULL;
   jq_util_input_state *input_state = NULL;
   int ret = JQ_OK_NO_OUTPUT;