From e9d063f70b18d27c99c3ea19480f782471e354dd Mon Sep 17 00:00:00 2001
From: samr7 <samr7@cs.washington.edu>
Date: Thu, 7 Jul 2011 13:15:46 -0700
Subject: [PATCH] Fix Win32 nmake build, increase warning level, resolve
 warnings

---
 Makefile.Win32 | 8 +++++---
 vanitygen.c    | 2 +-
 winglue.c      | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile.Win32 b/Makefile.Win32
index 3175fe7..c9107e0 100644
--- a/Makefile.Win32
+++ b/Makefile.Win32
@@ -3,14 +3,16 @@ OPENSSL_DIR = C:\OpenSSL-Win32
 PTHREADS_DIR = C:\pthreads-w32
 PCRE_DIR = C:\pcre-7.9-src
 CFLAGS = /D_WIN32 /DPTW32_STATIC_LIB /DPCRE_STATIC /I$(OPENSSL_DIR)\include /I$(PTHREADS_DIR) /I$(PCRE_DIR)
-LIBS = $(OPENSSL_DIR)\lib\libeay32.dll $(PTHREADS_DIR)\pthread.lib $(PCRE_DIR)\pcre.lib ws2_32.lib
+LIBS = $(OPENSSL_DIR)\lib\libeay32.lib $(PTHREADS_DIR)\pthread.lib $(PCRE_DIR)\pcre.lib ws2_32.lib
 OBJS = vanitygen.obj
 
 all: vanitygen.exe
-	link /nologo /out:vanitygen.exe $(LIBS)
+
+vanitygen.exe: $(OBJS)
+	link /nologo /out:vanitygen.exe $(OBJS) $(LIBS)
 
 .c.obj:
-	$(CC) $(CFLAGS) /Tp$< /Fo$@
+	$(CC) $(CFLAGS) /c /Tp$< /Fo$@
 
 clean:
 	del vanitygen.exe
diff --git a/vanitygen.c b/vanitygen.c
index 706ca97..790acae 100644
--- a/vanitygen.c
+++ b/vanitygen.c
@@ -71,7 +71,7 @@ encode_b58_check(void *buf, size_t len, char *result)
 	bndiv = &bnb;
 
 	brlen = (2 * len) + 4;
-	binres = malloc(brlen);
+	binres = (unsigned char*) malloc(brlen);
 	memcpy(binres, buf, len);
 
 	SHA256(binres, len, hash1);
diff --git a/winglue.c b/winglue.c
index c24a4a4..0239bdf 100644
--- a/winglue.c
+++ b/winglue.c
@@ -133,7 +133,7 @@ int getopt(int argc, TCHAR *argv[], TCHAR *optstring)
 int __cdecl __initptw32(void);
 #define _CRTALLOC(x) __declspec(allocate(x))
 _CRTALLOC(".CRT$XIC")
-static pinit = __initptw32;
+static int (*pinit)(void) = __initptw32;
 int __cdecl
 __initptw32(void)
 {