Index: include/log4cxx/config_msvc.h.in
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/include/log4cxx/config_msvc.h.in,v
retrieving revision 1.1
diff -u -r1.1 config_msvc.h.in
--- include/log4cxx/config_msvc.h.in	13 May 2004 21:18:31 -0000	1.1
+++ include/log4cxx/config_msvc.h.in	3 Aug 2004 04:51:16 -0000
@@ -27,7 +27,7 @@
 
 typedef __int64 int64_t;
 
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 #pragma warning(disable : 4250 4251 4786 4290)
 #endif
 
Index: include/log4cxx/helpers/tchar.h
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/include/log4cxx/helpers/tchar.h,v
retrieving revision 1.37
diff -u -r1.37 tchar.h
--- include/log4cxx/helpers/tchar.h	30 May 2004 10:17:00 -0000	1.37
+++ include/log4cxx/helpers/tchar.h	3 Aug 2004 04:51:16 -0000
@@ -44,7 +44,7 @@
 	
 	static void int64ToString(wchar_t * dst, size_t maxlen, const int64_t& ll)
 	{
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 		_snwprintf(dst, maxlen, L"%I64d", ll);
 #else
 #ifdef HAVE_SWPRINTF
@@ -55,7 +55,7 @@
 	
 	static void int64ToString(char * dst, size_t maxlen, const int64_t& ll)
 	{
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 		_snprintf(dst, maxlen, "%I64d", ll);
 #else
 		snprintf(dst, maxlen, "%lld", ll);
Index: src/datagramsocket.cpp
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/src/datagramsocket.cpp,v
retrieving revision 1.8
diff -u -r1.8 datagramsocket.cpp
--- src/datagramsocket.cpp	13 May 2004 21:14:38 -0000	1.8
+++ src/datagramsocket.cpp	3 Aug 2004 04:51:16 -0000
@@ -16,7 +16,7 @@
  
 #include <log4cxx/portability.h>
 
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 #include <windows.h>
 #include <winsock.h>
 #else
@@ -98,7 +98,7 @@
 	if (fd != 0)
 	{
 		LOGLOG_DEBUG(_T("closing socket"));
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 		if (::closesocket(fd) == -1)
 #else
 		if (::close(fd) == -1)
@@ -149,7 +149,7 @@
 	addr.sin_addr.s_addr = htonl(p->getAddress().address);
 	addr.sin_port = htons(p->getPort());
 
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 	if (::recvfrom(fd, (char *)p->getData(), p->getLength(), 0,
 		(sockaddr *)&addr, &addr_len) == -1)
 #elif defined(__hpux)
@@ -175,7 +175,7 @@
 	addr.sin_addr.s_addr = htonl(p->getAddress().address);
 	addr.sin_port = htons(p->getPort());
 
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 	if (::sendto(fd, (const char *)p->getData(), p->getLength(), 0,
 		(sockaddr *)&addr, addr_len) == -1)
 #else
Index: src/inetaddress.cpp
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/src/inetaddress.cpp,v
retrieving revision 1.8
diff -u -r1.8 inetaddress.cpp
--- src/inetaddress.cpp	28 Apr 2004 05:07:07 -0000	1.8
+++ src/inetaddress.cpp	3 Aug 2004 04:51:16 -0000
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 #include <windows.h>
 #include <winsock.h>
 #else
Index: src/nteventlogappender.cpp
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/src/nteventlogappender.cpp,v
retrieving revision 1.7
diff -u -r1.7 nteventlogappender.cpp
--- src/nteventlogappender.cpp	22 Apr 2004 21:21:33 -0000	1.7
+++ src/nteventlogappender.cpp	3 Aug 2004 04:51:16 -0000
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 
 #include <windows.h>
 #undef ERROR
Index: src/odbcappender.cpp
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/src/odbcappender.cpp,v
retrieving revision 1.10
diff -u -r1.10 odbcappender.cpp
--- src/odbcappender.cpp	13 May 2004 21:14:38 -0000	1.10
+++ src/odbcappender.cpp	3 Aug 2004 04:51:16 -0000
@@ -16,7 +16,7 @@
  
 #include <log4cxx/portability.h>
 
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 #include <windows.h>
 #endif
 
Index: src/serversocket.cpp
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/src/serversocket.cpp,v
retrieving revision 1.7
diff -u -r1.7 serversocket.cpp
--- src/serversocket.cpp	25 May 2004 06:06:11 -0000	1.7
+++ src/serversocket.cpp	3 Aug 2004 04:51:16 -0000
@@ -16,7 +16,7 @@
  
 #include <log4cxx/portability.h>
 
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 #include <windows.h>
 #include <winsock.h>
 #else
Index: src/simplesocketserver.cpp
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/src/simplesocketserver.cpp,v
retrieving revision 1.11
diff -u -r1.11 simplesocketserver.cpp
--- src/simplesocketserver.cpp	13 May 2004 21:14:38 -0000	1.11
+++ src/simplesocketserver.cpp	3 Aug 2004 04:51:16 -0000
@@ -16,7 +16,7 @@
  
 #include <log4cxx/portability.h>
 
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 #include <windows.h>
 #endif
 
Index: src/socket.cpp
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/src/socket.cpp,v
retrieving revision 1.9
diff -u -r1.9 socket.cpp
--- src/socket.cpp	13 May 2004 21:14:38 -0000	1.9
+++ src/socket.cpp	3 Aug 2004 04:51:16 -0000
@@ -16,7 +16,7 @@
  
 #include <log4cxx/portability.h>
 
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 #include <windows.h>
 #include <winsock.h>
 #else
Index: src/socketimpl.cpp
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/src/socketimpl.cpp,v
retrieving revision 1.14
diff -u -r1.14 socketimpl.cpp
--- src/socketimpl.cpp	13 May 2004 21:14:38 -0000	1.14
+++ src/socketimpl.cpp	3 Aug 2004 04:51:17 -0000
@@ -16,7 +16,7 @@
  
 #include <log4cxx/portability.h>
 
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 #include <windows.h>
 #include <winsock.h>
 #else
@@ -42,7 +42,7 @@
 #include <string.h>
 #include <assert.h>
 
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 namespace {
     class WinSockInitializer {
     public:
@@ -61,7 +61,7 @@
 
 SocketException::SocketException()
 {
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 	TCHAR messageBuffer[256];
 	DWORD dwError = ::WSAGetLastError();
 
@@ -116,7 +116,7 @@
 void SocketImpl::accept(SocketImplPtr s)
 {
 	sockaddr_in client_addr;
-#if defined(WIN32) || defined(__hpux)
+#if defined(WIN32) || defined(_WIN32) || defined(__hpux)
 	int client_len;
 #else
 	socklen_t client_len;
@@ -191,7 +191,7 @@
 	if (fd != 0)
 	{
 		LOGLOG_DEBUG(_T("closing socket"));
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 		if (::closesocket(fd) == -1)
 #else
 		if (::close(fd) == -1)
@@ -272,7 +272,7 @@
 
 	while ((size_t)(p - (unsigned char *)buf) < len)
 	{
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 		len_read = ::recv(fd, (char *)p, len - (p - (unsigned char *)buf), 0);
 #else
 		len_read = ::read(fd, p, len - (p - (unsigned char *)buf));
@@ -301,7 +301,7 @@
 
 	while ((size_t)(p - (const unsigned char *)buf) < len)
 	{
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 		len_written = ::send(fd, (const char *)p, len - (p - (const unsigned char *)buf), 0);
 #else
 		len_written = ::write(fd, p, len - (p - (const unsigned char *)buf));
Index: src/stringtokenizer.cpp
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/src/stringtokenizer.cpp,v
retrieving revision 1.4
diff -u -r1.4 stringtokenizer.cpp
--- src/stringtokenizer.cpp	22 Apr 2004 21:21:34 -0000	1.4
+++ src/stringtokenizer.cpp	3 Aug 2004 04:51:17 -0000
@@ -26,7 +26,7 @@
 
 #ifdef UNICODE
 	wcscpy(this->str, str.c_str());
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 	token = wcstok(this->str, this->delim.c_str());
 #else
 	token = wcstok(this->str, this->delim.c_str(), &state);
@@ -57,7 +57,7 @@
 	String currentToken = token;
 
 #ifdef UNICODE
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 	token = wcstok(0, delim.c_str());
 #else
 	token = wcstok(0, delim.c_str(), &state);
Index: tests/src/net/socketservertestcase.cpp
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/tests/src/net/socketservertestcase.cpp,v
retrieving revision 1.2
diff -u -r1.2 socketservertestcase.cpp
--- tests/src/net/socketservertestcase.cpp	22 Apr 2004 21:21:37 -0000	1.2
+++ tests/src/net/socketservertestcase.cpp	3 Aug 2004 04:51:17 -0000
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32)
 	#include <windows.h>
 #endif