diff -Nrup a/cmds.h b/cmds.h
--- a/cmds.h	2014-09-14 09:55:26.000000000 -0600
+++ b/cmds.h	2019-09-24 11:41:56.743700648 -0600
@@ -26,7 +26,7 @@
 #define CMD	uint32
 
 #define msg_command				0x80000000
-#define HT_COMMAND(c)				(msg_command+(c))
+#define HT_COMMAND(c)				int(msg_command+(c))
 
 #define cmd_quit				HT_COMMAND(100)
 #define cmd_about				HT_COMMAND(101)
diff -Nrup a/htmacho.cc b/htmacho.cc
--- a/htmacho.cc	2014-09-14 09:55:26.000000000 -0600
+++ b/htmacho.cc	2019-09-24 11:47:51.658219398 -0600
@@ -146,7 +146,7 @@ void ht_macho::init(Bounds *b, File *f,
 				break;
 			case MACHO_CPU_TYPE_I386:
 				switch (c->flavor) {
-				case -1:
+				case -1u:
 					createHostStruct(&c->state, MACHO_I386_THREAD_STATE_struct, image_endianess);
 					break;
 				}
diff -Nrup a/htmachohd.cc b/htmachohd.cc
--- a/htmachohd.cc	2014-09-14 09:55:26.000000000 -0600
+++ b/htmachohd.cc	2019-09-24 11:51:39.096270195 -0600
@@ -313,7 +313,7 @@ static ht_view *htmachoheader_init(Bound
 				switch (macho_shared->header.cputype) {
 				case MACHO_CPU_TYPE_I386:
 					switch (c->flavor) {
-					case -1:
+					case -1u:
 						m->add_staticmask_ptable(macho_i386_thread_state, ofs+4*4/*4 32bit words in thread_header*/, isbigendian);
 						break;
 					}