From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 25 Dec 2008 19:52:00 +0000 (+0000)
Subject: mingw32 typedef's and not define's SOCKET so test for __WXMSW__ before redefining... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9508a3e9a0b226b39f2a0eb9e12ae517a6e17630

mingw32 typedef's and not define's SOCKET so test for __WXMSW__ before redefining it ourselves

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/private/socket.h b/include/wx/private/socket.h
index c7eef411d4..bc4e35013f 100644
--- a/include/wx/private/socket.h
+++ b/include/wx/private/socket.h
@@ -3,7 +3,7 @@
 // Purpose:     wxSocketImpl nd related declarations
 // Authors:     Guilhem Lavaux, Vadim Zeitlin
 // Created:     April 1997
-// RCS-ID:      $Id: socket.h 56994 2008-11-28 12:47:07Z VZ $
+// RCS-ID:      $Id$
 // Copyright:   (c) 1997 Guilhem Lavaux
 //              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -78,7 +78,7 @@
 
 // define some symbols which winsock.h defines but traditional BSD headers
 // don't
-#ifndef SOCKET
+#ifndef __WXMSW__
     #define SOCKET int
 #endif