From b7811e613d035e6bbe8a7f119b9af03e5370fca1 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Fri, 20 Jan 2012 08:59:07 -0800
Subject: [PATCH] small fixes for building dist on windows

---
 mk/dist.mk          | 4 ++--
 mk/target.mk        | 2 +-
 src/rt/rust_shape.h | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mk/dist.mk b/mk/dist.mk
index 64ad91a93805..236f0bf1f473 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -41,9 +41,9 @@ lic.txt: $(S)LICENSE.txt
 	@$(Q)perl -pe 's@\r\n|\n@\r\n@go' <$< >$@
 
 ifdef CFG_MAKENSIS
-$(PKG_EXE): all rustc-stage3 $(PKG_NSI) $(PKG_FILES) lic.txt
+$(PKG_EXE): $(PKG_NSI) $(PKG_FILES) all rustc-stage3 lic.txt
 	@$(call E, makensis: $@)
-	$(Q)$(CFG_MAKENSIS) -NOCD -V1 "-XOutFile $@" \
+	$(Q)"$(CFG_MAKENSIS)" -NOCD -V1 "-XOutFile $@" \
                         "-XLicenseData lic.txt" $<
 	$(Q)rm -f lic.txt
 endif
diff --git a/mk/target.mk b/mk/target.mk
index 453517987119..64d6e30cdd0d 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -7,7 +7,7 @@
 # If you are making non-backwards compatible changes to the runtime,
 # set this flag to 1.  It will cause stage1 to use the snapshot
 # runtime rather than the runtime from the working directory.
-USE_SNAPSHOT_RUNTIME=0
+USE_SNAPSHOT_RUNTIME=1
 
 define TARGET_STAGE_N
 
diff --git a/src/rt/rust_shape.h b/src/rt/rust_shape.h
index 848e304df302..3cbb40335162 100644
--- a/src/rt/rust_shape.h
+++ b/src/rt/rust_shape.h
@@ -26,8 +26,8 @@
 
 namespace shape {
 
-typedef unsigned long tag_variant_t;
-typedef unsigned long tag_align_t;
+typedef unsigned tag_variant_t;
+typedef unsigned tag_align_t;
 typedef unsigned long ref_cnt_t;
 
 // Constants