Merge pull request #148 from davidgiven/dtrg-windows

Make the ACK build on Windows again.

.appveyor.yml

@@ -0,0 +1,17 @@
+environment:
+  matrix:
+  - CYGWIN: C:\cygwin64
+
+clone_depth: 1
+
+init:
+  - git config --global core.autocrlf input
+
+install:
+  - '%CYGWIN%\bin\bash -lc "cygcheck -dc cygwin"'
+  - '%CYGWIN%\setup-x86_64 -q -P bison,flex,ninja'
+
+build_script:
+  - 'echo building...'
+  - '%CYGWIN%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make +ack"'
+

plat/cpm/emu/emulator.c

@@ -77,7 +77,7 @@ static void cmd_register(void)
 
 	if (w1 && w2)
 	{
-		Z80_REG_T reg = -1;
+		int reg = -1;
 		if (strcmp(w1, "sp") == 0)
 			reg = SP;
 		else if (strcmp(w1, "pc") == 0)

plat/cpm/emu/globals.h

@@ -2,9 +2,7 @@
 #define GLOBALS_H
 
 #include <stdbool.h>
-#include <z80ex/z80ex.h>
 
-extern Z80EX_CONTEXT* z80;
 extern uint8_t ram[0x10000];
 
 extern void emulator_init(void);

util/ego/bo/bo.c

@@ -24,7 +24,7 @@
 #include "../share/lset.h"
 #include "../share/map.h"
 #include "../share/alloc.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/def.h"
 #include "../share/go.h"
 

util/ego/cf/cf_loop.c

@@ -14,7 +14,7 @@
 #include "../share/debug.h"
 #include "../share/lset.h"
 #include "../share/alloc.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "cf.h"
 
 #define MARK_STRONG(b)	b->b_flags |= BF_STRONG

util/ego/cj/cj.c

@@ -22,7 +22,7 @@
 #include "../share/lset.h"
 #include "../share/map.h"
 #include "../share/alloc.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/def.h"
 #include "../share/stack_chg.h"
 #include "../share/go.h"

util/ego/cs/cs_aux.c

@@ -5,7 +5,7 @@
  */
 #include "../share/types.h"
 #include "../share/debug.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/global.h"
 #include "../share/lset.h"
 #include "cs.h"

util/ego/cs/cs_avail.c

@@ -11,7 +11,7 @@
 #include <em_mnem.h>
 #include "../share/types.h"
 #include "../share/debug.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/lset.h"
 #include "../share/global.h"
 #include "cs.h"

util/ego/cs/cs_elim.c

@@ -8,7 +8,7 @@
 #include "../share/types.h"
 #include "../share/alloc.h"
 #include "../share/lset.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/global.h"
 #include "../share/debug.h"
 #include "cs.h"

util/ego/cs/cs_getent.c

@@ -5,7 +5,7 @@
  */
 #include <em_mnem.h>
 #include "../share/types.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/debug.h"
 #include "../share/global.h"
 #include "cs.h"

util/ego/cs/cs_kill.c

@@ -9,7 +9,7 @@
 #include "../share/global.h"
 #include "../share/lset.h"
 #include "../share/cset.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/map.h"
 #include "cs.h"
 #include "cs_aux.h"

util/ego/cs/cs_partit.c

@@ -10,7 +10,7 @@
 #include <em_reg.h>
 #include <em_spec.h>
 #include "../share/types.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/debug.h"
 #include "../share/global.h"
 #include "cs.h"

util/ego/cs/cs_profit.c

@@ -10,7 +10,7 @@
 #include "../share/types.h"
 #include "../share/debug.h"
 #include "../share/global.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/cset.h"
 #include "../share/lset.h"
 #include "cs.h"

util/ego/cs/cs_stack.c

@@ -9,7 +9,7 @@
 #include "../share/types.h"
 #include "../share/global.h"
 #include "../share/debug.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "cs.h"
 #include "cs_aux.h"
 

util/ego/cs/cs_vnm.c

@@ -10,7 +10,7 @@
 #include "../share/types.h"
 #include "../share/global.h"
 #include "../share/debug.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "cs.h"
 #include "cs_alloc.h"
 #include "cs_aux.h"

util/ego/ic/ic.c

@@ -27,7 +27,7 @@
 #include "../share/global.h"
 #include "../share/files.h"
 #include "../share/put.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 
 /* Global variables */
 

util/ego/ic/ic_aux.c

@@ -17,7 +17,7 @@
 #include "../share/global.h"
 #include "../share/debug.h"
 #include "../share/def.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "ic.h"
 #include "ic_io.h"
 #include "ic_lookup.h"

util/ego/il/il1_anal.c

@@ -17,7 +17,7 @@
 #include "../share/alloc.h"
 #include "../share/global.h"
 #include "../share/lset.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "il1_aux.h"
 #include "il1_formal.h"
 #include "il1_cal.h"

util/ego/il/il2_aux.c

@@ -21,7 +21,7 @@
 #include "il_aux.h"
 #include "il2_aux.h"
 #include "../share/get.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 
 #define USE_INDIR(p)	(p->p_use->u_flags & UF_INDIR)
 

util/ego/il/il3_change.c

@@ -22,7 +22,7 @@
 #include "../share/global.h"
 #include "../share/def.h"
 #include "../share/lset.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/get.h"
 #include "../share/put.h"
 #include "il_aux.h"

util/ego/lv/lv.c

@@ -25,7 +25,7 @@
 #include "../share/map.h"
 #include "../share/get.h"
 #include "../share/put.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/init_glob.h"
 #include "../share/locals.h"
 #include "../share/go.h"

util/ego/ra/ra_allocl.c

@@ -18,7 +18,7 @@
 #include "../share/global.h"
 #include "../share/lset.h"
 #include "../share/cset.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/alloc.h"
 #include "../share/map.h"
 #include "ra.h"

util/ego/ra/ra_items.c

@@ -17,7 +17,7 @@
 #include "../share/def.h"
 #include "../share/global.h"
 #include "../share/lset.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/alloc.h"
 #include "ra.h"
 #include "ra_aux.h"

util/ego/ra/ra_lifet.c

@@ -19,7 +19,7 @@
 #include "../share/def.h"
 #include "../share/global.h"
 #include "../share/lset.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/alloc.h"
 #include "ra.h"
 #include "ra_aux.h"

util/ego/ra/ra_pack.c

@@ -17,7 +17,7 @@
 #include "../share/lset.h"
 #include "../share/cset.h"
 #include "../share/alloc.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "ra.h"
 #include "ra_aux.h"
 #include "ra_interv.h"

util/ego/ra/ra_xform.c

@@ -19,7 +19,7 @@
 #include "../share/def.h"
 #include "../share/global.h"
 #include "../share/lset.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/alloc.h"
 #include "ra.h"
 #include "ra_interv.h"

util/ego/share/build.lua

@@ -36,7 +36,7 @@ clibrary {
 		"./files.c",
 		"./go.c",
 		"./map.c",
-		"./aux.c",
+		"./utils.c",
 		"./get.c",
 		"./put.c",
 		"./alloc.c",

util/ego/share/get.c

@@ -22,7 +22,7 @@
 #include "get.h"
 #include "alloc.h"
 #include "map.h"
-#include "aux.h"
+#include "utils.h"
 
 FILE *curinp;
 block_id lastbid;	/* block identifying number */

util/ego/share/locals.c

@@ -20,7 +20,7 @@
 #include "cset.h"
 #include "def.h"
 #include "get.h"
-#include "aux.h"
+#include "utils.h"
 #include "alloc.h"
 #include "locals.h"
 

util/ego/share/parser.c

@@ -12,7 +12,7 @@
 #include "alloc.h"
 #include "global.h"
 #include "lset.h"
-#include "aux.h"
+#include "utils.h"
 
 struct class {
 	byte	src_class;

util/ego/share/utils.c

@@ -15,7 +15,7 @@
 #include "debug.h"
 #include "global.h"
 #include "alloc.h"
-#include "aux.h"
+#include "utils.h"
 #include "map.h"
 #include "lset.h"
 

util/ego/sp/sp.c

@@ -23,7 +23,7 @@
 #include "../share/lset.h"
 #include "../share/map.h"
 #include "../share/alloc.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/go.h"
 #include "../share/stack_chg.h"
 

util/ego/sr/sr.c

@@ -20,7 +20,7 @@
 #include "../share/map.h"
 #include "../share/alloc.h"
 #include "../share/go.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "sr_aux.h"
 #include "sr_iv.h"
 

util/ego/sr/sr_aux.c

@@ -17,7 +17,7 @@
 #include "../share/debug.h"
 #include "../share/global.h"
 #include "../share/lset.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "sr_aux.h"
 #include "sr_xform.h"
 

util/ego/sr/sr_cand.c

@@ -17,7 +17,7 @@
 #include "../share/debug.h"
 #include "../share/global.h"
 #include "../share/map.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "sr.h"
 #include "sr_aux.h"
 #include "sr_cand.h"

util/ego/sr/sr_expr.c

@@ -16,7 +16,7 @@
 #include "sr.h"
 #include "../share/debug.h"
 #include "../share/global.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "sr_aux.h"
 #include "../share/lset.h"
 #include "sr_iv.h"

util/ego/sr/sr_iv.c

@@ -19,7 +19,7 @@
 #include "../share/debug.h"
 #include "../share/global.h"
 #include "../share/alloc.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "sr_aux.h"
 #include "sr_cand.h"
 #include "sr_iv.h"

util/ego/sr/sr_reduce.c

@@ -22,7 +22,7 @@
 #include "../share/alloc.h"
 #include "../share/def.h"
 #include "../share/global.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "sr_aux.h"
 #include "../share/lset.h"
 #include "sr_xform.h"

util/ego/sr/sr_xform.c

@@ -24,7 +24,7 @@
 #include "../share/get.h"
 #include "sr_aux.h"
 #include "../share/lset.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "sr_xform.h"
 
 /* Transformations on EM texts */

util/ego/ud/ud.c

@@ -21,7 +21,7 @@
 #include "../share/get.h"
 #include "../share/put.h"
 #include "../share/alloc.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/init_glob.h"
 #include "../share/locals.h"
 #include "../share/go.h"

util/ego/ud/ud_aux.c

@@ -21,7 +21,7 @@
 #include "../share/cset.h"
 #include "../share/def.h"
 #include "../share/locals.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "ud_defs.h"
 
 repl_line(old,new,b)

util/ego/ud/ud_const.c

@@ -16,7 +16,7 @@
 #include "../share/lset.h"
 #include "../share/cset.h"
 #include "../share/def.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/locals.h"
 #include "ud_defs.h"
 #include "ud_const.h"

util/ego/ud/ud_copy.c

@@ -16,7 +16,7 @@
 #include "../share/lset.h"
 #include "../share/cset.h"
 #include "../share/def.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 #include "../share/locals.h"
 #include "../ud/ud_defs.h"
 #include "ud_copy.h"

util/ego/ud/ud_defs.c

@@ -20,7 +20,7 @@
 #include "../share/locals.h"
 #include "ud_defs.h"
 #include "../share/alloc.h"
-#include "../share/aux.h"
+#include "../share/utils.h"
 
 short nrdefs;		/* total number of definitions */
 short nrexpldefs;	/* number of explicit definitions */