Backed-out PNG8 patch (no time to look at why

[wxWidgets.git] / src / msw / gsockmsw.cpp

diff --git a/src/msw/gsockmsw.cpp b/src/msw/gsockmsw.cpp
index 81affd4f960ffc00fb1caa9c402ec0e1a86942f1..df90c628adc8cace88bd4c4bd9484cf3950e3fae 100644 (file)
--- a/src/msw/gsockmsw.cpp
+++ b/src/msw/gsockmsw.cpp
@@ -1,12 +1,19 @@
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket)
- * Name:    gsockmsw.c
+ * Name:    gsockmsw.cpp
  * Author:  Guillermo Rodriguez Garcia <guille@iies.es>
  * Purpose: GSocket GUI-specific MSW code
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 /*
  * TODO: for WinCE we need to replace WSAAsyncSelect
  * (Windows message-based notification of network events for a socket)
@@ -15,10 +22,6 @@
  * using select() and sends a message to the main thread.
  */
 
-/*
- * PLEASE don't put C++ comments here - this is a C source file.
- */
-
 /* including rasasync.h (included from windows.h itself included from
  * wx/setup.h and/or winsock.h results in this warning for
  * RPCNOTIFICATION_ROUTINE
@@ -55,7 +58,7 @@
 #include "wx/msw/gsockmsw.h"
 #include "wx/gsocket.h"
 
-extern "C" HINSTANCE wxGetInstance(void);
+extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);
 #define INSTANCE wxGetInstance()
 
 #else
@@ -67,6 +70,7 @@ extern "C" HINSTANCE wxGetInstance(void);
  * be available and it must contain the app's instance
  * handle.
  */
+extern HINSTANCE hInst;
 #define INSTANCE hInst
 
 #endif /* __GSOCKET_STANDALONE__ */
@@ -113,7 +117,6 @@ LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
 
 /* Global variables */
 
-extern HINSTANCE INSTANCE;
 static HWND hWin;
 static CRITICAL_SECTION critical;
 static GSocket* socketList[MAXSOCKETS];