From 00e17886751ee7ff973caaa2dc3ad4d646fb61fb Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sat, 24 Mar 2007 13:55:59 +0000
Subject: [PATCH] applied patch #1680556 - fixes to allow zip2exe & Makensisw
 to build in winelib

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5008 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Makensisw/jnetlib/asyncdns.cpp | 2 +-
 Contrib/Makensisw/jnetlib/asyncdns.h   | 2 +-
 Contrib/zip2exe/main.cpp               | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Contrib/Makensisw/jnetlib/asyncdns.cpp b/Contrib/Makensisw/jnetlib/asyncdns.cpp
index cf8b7c27..4789bdac 100644
--- a/Contrib/Makensisw/jnetlib/asyncdns.cpp
+++ b/Contrib/Makensisw/jnetlib/asyncdns.cpp
@@ -30,7 +30,7 @@ JNL_AsyncDNS::~JNL_AsyncDNS()
   }
 }
 
-unsigned long WINAPI JNL_AsyncDNS::_threadfunc(LPVOID _d)
+DWORD WINAPI JNL_AsyncDNS::_threadfunc(LPVOID _d)
 {
   JNL_AsyncDNS *_this=(JNL_AsyncDNS*)_d;
   int nowinsock=JNL::open_socketlib();
diff --git a/Contrib/Makensisw/jnetlib/asyncdns.h b/Contrib/Makensisw/jnetlib/asyncdns.h
index 5aa16271..a8bbb466 100644
--- a/Contrib/Makensisw/jnetlib/asyncdns.h
+++ b/Contrib/Makensisw/jnetlib/asyncdns.h
@@ -31,7 +31,7 @@ private:
 
   volatile int m_thread_kill;
   HANDLE m_thread;
-  static unsigned long WINAPI _threadfunc(LPVOID _d);
+  static DWORD WINAPI _threadfunc(LPVOID _d);
 
 };
 
diff --git a/Contrib/zip2exe/main.cpp b/Contrib/zip2exe/main.cpp
index e934c0dc..3f266c8b 100644
--- a/Contrib/zip2exe/main.cpp
+++ b/Contrib/zip2exe/main.cpp
@@ -412,9 +412,9 @@ DWORD WINAPI ThreadProc(LPVOID p) // thread that will start & monitor wwwinamp
     return 1;
   }
 
-  unsigned long exit=0;  //process exit code
-  unsigned long bread;   //bytes read
-  unsigned long avail;   //bytes available
+  DWORD exit=0;  //process exit code
+  DWORD bread;   //bytes read
+  DWORD avail;   //bytes available
 
   memset(buf,0,sizeof(buf));
   while (1)      //main program loop