various unsigned long -> uintptr_t conversions

qtv/source/connection.c

@@ -59,7 +59,7 @@ connection_free (void *_c, void *unused)
 	free (_c);
 }
 
-static unsigned long
+static uintptr_t
 connection_get_hash (void *_c, void *unused)
 {
 	connection_t *c = (connection_t *) _c;

tools/build_scripts/qf-release

@@ -59,7 +59,6 @@ mkdir -p ~/release
 cd ~/release
 if test $no_rm -ne 1; then
 	rm -rf NEWS quakeforge-* quakeforge_* qfcc_*
-	exit
 fi
 svn co ${svn_url}/quakeforge/${tag_path} quakeforge-${ver}
 cd quakeforge-$ver
@@ -106,7 +105,7 @@ if test $do_win32 -eq 1; then
 	./cross-configure.sh \
 		CFLAGS=-I${mingw32}/include LDLAGS=-L${mingw32}/lib \
 		--with-sdl-prefix=${mingw32} \
-		--disable-debug --disable-shared --disable-debug \
+		--disable-debug --disable-shared --disable-jack \
 		--program-prefix=
 	../tools/cross/cross-make.sh -j3 \
 		prefix=${qf_win32_dir} \

tools/qfcc/source/class.c

@@ -504,7 +504,7 @@ class_message_response (class_t *class, int class_msg, expr_t *sel)
 	return 0;
 }
 
-static unsigned long
+static uintptr_t
 category_get_hash (void *_c, void *unused)
 {
 	category_t *c = (category_t *) _c;

tools/qfcc/source/def.c

@@ -459,7 +459,7 @@ free_tempdefs (void)
 void
 reset_tempdefs (void)
 {
-	unsigned int i;
+	size_t      i;
 	def_t      *d;
 
 	tempdef_counter = 0;

tools/qfcc/source/immediate.c

@@ -81,7 +81,7 @@ static hashtab_t *pointer_imm_defs;
 static hashtab_t *quaternion_imm_defs;
 static hashtab_t *integer_imm_defs;
 
-static unsigned long
+static uintptr_t
 imm_get_hash (void *_imm, void *_tab)
 {
 	immediate_t *imm = (immediate_t *) _imm;

tools/qfcc/source/linker.c

@@ -846,9 +846,9 @@ undefined_def (qfo_def_t *def)
 			line_def.file = best->file;
 			line_def.line = best->line;
 			if (!line->line
-				&& line->fa.func == (unsigned int) (best - funcs.funcs)) {
+				&& line->fa.func == (unsigned) (best - funcs.funcs)) {
 				while (line - lines.lines < lines.num_lines - 1 && line[1].line
-					   && line[1].fa.addr <= (unsigned int) reloc->ofs)
+					   && line[1].fa.addr <= (unsigned) reloc->ofs)
 					line++;
 				line_def.line = line->line + best->line;
 			}

tools/qfcc/source/method.c

@@ -286,11 +286,11 @@ static hashtab_t *sel_hash;
 static hashtab_t *sel_index_hash;
 static int sel_index;
 
-static unsigned long
+static uintptr_t
 sel_get_hash (void *_sel, void *unused)
 {
 	selector_t *sel = (selector_t *) _sel;
-	unsigned long hash;
+	uintptr_t   hash;
 
 	hash = Hash_String (sel->name);
 	return hash;
@@ -307,7 +307,7 @@ sel_compare (void *_s1, void *_s2, void *unused)
 	return cmp;
 }
 
-static unsigned long
+static uintptr_t
 sel_index_get_hash (void *_sel, void *unused)
 {
 	selector_t *sel = (selector_t *) _sel;

tools/qfcc/source/opcodes.c

@@ -69,12 +69,12 @@ opcode_t   *op_jumpb;
 
 #define ROTL(x,n) (((x)<<(n))|(x)>>(32-n))
 
-static unsigned long
+static uintptr_t
 get_hash (void *_op, void *_tab)
 {
 	opcode_t   *op = (opcode_t *) _op;
 	hashtab_t **tab = (hashtab_t **) _tab;
-	unsigned long hash;
+	uintptr_t   hash;
 
 	if (tab == &opcode_type_table_ab) {
 		hash = ROTL (~op->type_a, 8) + ROTL (~op->type_b, 16);

tools/qfcc/source/qfprogs.c

@@ -166,7 +166,7 @@ free_progs_mem (progs_t *pr, void *mem)
 	free (mem);
 }
 
-static unsigned long
+static uintptr_t
 func_hash (void *func, void *unused)
 {
 	return ((dfunction_t *) func)->first_statement;

tools/qfcc/source/switch.c

@@ -64,7 +64,7 @@ typedef struct case_node_s {
 	struct case_node_s *left, *right;
 } case_node_t;
 
-static unsigned long
+static uintptr_t
 get_hash (void *_cl, void *unused)
 {
 	case_label_t *cl = (case_label_t *) _cl;
@@ -72,7 +72,7 @@ get_hash (void *_cl, void *unused)
 	if (!cl->value)
 		return 0;
 	if (cl->value->type == ex_string)
-		return (unsigned long) cl->value->e.string_val;
+		return (uintptr_t) cl->value->e.string_val;
 	return cl->value->e.integer_val;
 }