Fix warnings in the MSW IE backend.

[wxWidgets.git] / include / wx / private / fd.h

diff --git a/include/wx/private/fd.h b/include/wx/private/fd.h
index 462b9bdf3a4863281797bbf404594301ded14718..a8f6152c2790e9b7b601092167ac2d2d6793ae9c 100644 (file)
--- a/include/wx/private/fd.h
+++ b/include/wx/private/fd.h
@@ -37,11 +37,11 @@
         return FD_ISSET(fd, fds);
         #pragma warning(pop)
     }
         return FD_ISSET(fd, fds);
         #pragma warning(pop)
     }

-    inline bool wxFD_CLR(int fd, fd_set *fds)
+    inline void wxFD_CLR(int fd, fd_set *fds)

     {
         #pragma warning(push, 1)
         #pragma warning(disable:1469)
     {
         #pragma warning(push, 1)
         #pragma warning(disable:1469)

-        return FD_CLR(fd, fds);
+        FD_CLR(fd, fds);

         #pragma warning(pop)
     }
 #else // !__INTELC__
         #pragma warning(pop)
     }
 #else // !__INTELC__


@@ -51,16 +51,4 @@
     #define wxFD_CLR(fd, fds) FD_CLR(fd, fds)
 #endif // __INTELC__/!__INTELC__
 
     #define wxFD_CLR(fd, fds) FD_CLR(fd, fds)
 #endif // __INTELC__/!__INTELC__
 

-// this is for Windows where configure doesn't define this
-#ifndef SOCKOPTLEN_T
-    #define SOCKOPTLEN_T int
-#endif
-
-/*
- * MSW defines this, Unices don't.
- */
-#ifndef INVALID_SOCKET
-    #define INVALID_SOCKET (-1)
-#endif
-

 #endif // _WX_PRIVATE_FD_H_
 #endif // _WX_PRIVATE_FD_H_