compilation fixes for Unix after moving wxFD_XXX macros from wx/unix/private.h

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

diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index 70fd12f29938456dae4322fa71cc10d688ffde8d..4a36546b2c336778a953e8246434fe5f1c503ff7 100644 (file)
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -294,57 +294,6 @@ GSocketError _GAddress_Init_UNIX(GAddress *address);
 GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path);
 GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf);
 
 GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path);
 GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf);
 

-// standard linux headers produce many warnings when used with icc
-#if defined(__INTELC__) && defined(__LINUX__)
-    inline void wxFD_ZERO(fd_set *fds)
-    {
-        #pragma warning(push)
-        #pragma warning(disable:593)
-        FD_ZERO(fds);
-        #pragma warning(pop)
-    }
-
-    inline void wxFD_SET(int fd, fd_set *fds)
-    {
-        #pragma warning(push, 1)
-        #pragma warning(disable:1469)
-        FD_SET(fd, fds);
-        #pragma warning(pop)
-    }
-
-    inline bool wxFD_ISSET(int fd, fd_set *fds)
-    {
-        #pragma warning(push, 1)
-        #pragma warning(disable:1469)
-        return FD_ISSET(fd, fds);
-        #pragma warning(pop)
-    }
-    inline bool wxFD_CLR(int fd, fd_set *fds)
-    {
-        #pragma warning(push, 1)
-        #pragma warning(disable:1469)
-        return FD_CLR(fd, fds);
-        #pragma warning(pop)
-    }
-#else // !__INTELC__
-    #define wxFD_ZERO(fds) FD_ZERO(fds)
-    #define wxFD_SET(fd, fds) FD_SET(fd, fds)
-    #define wxFD_ISSET(fd, fds) FD_ISSET(fd, fds)
-    #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 /* wxUSE_SOCKETS */
 
 #endif /* _WX_GSOCKET_H_ */
 #endif /* wxUSE_SOCKETS */
 
 #endif /* _WX_GSOCKET_H_ */

diff --git a/include/wx/private/fd.h b/include/wx/private/fd.h
new file mode 100644 (file)
index 0000000..462b9bd
--- /dev/null
+++ b/include/wx/private/fd.h
@@ -0,0 +1,66 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/private/fd.h
+// Purpose:     private stuff for working with file descriptors
+// Author:      Vadim Zeitlin
+// Created:     2008-11-23 (moved from wx/unix/private.h)
+// RCS-ID:      $Id$
+// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_PRIVATE_FD_H_
+#define _WX_PRIVATE_FD_H_
+
+// standard Linux headers produce many warnings when used with icc so define
+// our own replacements for FD_XXX macros
+#if defined(__INTELC__) && defined(__LINUX__)
+    inline void wxFD_ZERO(fd_set *fds)
+    {
+        #pragma warning(push)
+        #pragma warning(disable:593)
+        FD_ZERO(fds);
+        #pragma warning(pop)
+    }
+
+    inline void wxFD_SET(int fd, fd_set *fds)
+    {
+        #pragma warning(push, 1)
+        #pragma warning(disable:1469)
+        FD_SET(fd, fds);
+        #pragma warning(pop)
+    }
+
+    inline bool wxFD_ISSET(int fd, fd_set *fds)
+    {
+        #pragma warning(push, 1)
+        #pragma warning(disable:1469)
+        return FD_ISSET(fd, fds);
+        #pragma warning(pop)
+    }
+    inline bool wxFD_CLR(int fd, fd_set *fds)
+    {
+        #pragma warning(push, 1)
+        #pragma warning(disable:1469)
+        return FD_CLR(fd, fds);
+        #pragma warning(pop)
+    }
+#else // !__INTELC__
+    #define wxFD_ZERO(fds) FD_ZERO(fds)
+    #define wxFD_SET(fd, fds) FD_SET(fd, fds)
+    #define wxFD_ISSET(fd, fds) FD_ISSET(fd, fds)
+    #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_

diff --git a/include/wx/unix/private.h b/include/wx/unix/private.h
index 627cdb64143bd91e9ea978f693f5064c7800326d..c45897473bceb272d75add806d3041122b303126 100644 (file)
--- a/include/wx/unix/private.h
+++ b/include/wx/unix/private.h
@@ -12,8 +12,9 @@
 #define _WX_UNIX_PRIVATE_H_
 
 // this file is currently empty as its original contents was moved to
 #define _WX_UNIX_PRIVATE_H_
 
 // this file is currently empty as its original contents was moved to

-// include/wx/gsocket.h but let's keep it for now in case we need it for
+// include/wx/private/fd.h but let's keep it for now in case we need it for

 // something again in the future
 // something again in the future

+#include "wx/private/fd.h"

 
 #endif // _WX_UNIX_PRIVATE_H_
 
 
 #endif // _WX_UNIX_PRIVATE_H_
 

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 266e81cce733918404b4ad56bc0cc2cdb167d62c..9273719a2888484d107c801917faef229d325da2 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -41,6 +41,7 @@
 #include "wx/stopwatch.h"
 #include "wx/thread.h"
 #include "wx/evtloop.h"
 #include "wx/stopwatch.h"
 #include "wx/thread.h"
 #include "wx/evtloop.h"

+#include "wx/private/fd.h"

 
 // DLL options compatibility check:
 #include "wx/build.h"
 
 // DLL options compatibility check:
 #include "wx/build.h"