add some wxIMAGE_OPTION_PNG_xxx options to wxImage and wxPNGHandler to allow the...

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

diff --git a/include/wx/unix/private.h b/include/wx/unix/private.h
index 9d2e338107207c7d64b9c82d3926ccc20caab519..c45897473bceb272d75add806d3041122b303126 100644 (file)
--- a/include/wx/unix/private.h
+++ b/include/wx/unix/private.h
@@ -11,37 +11,10 @@
 #ifndef _WX_UNIX_PRIVATE_H_
 #define _WX_UNIX_PRIVATE_H_
 
-// 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)
-    }
-#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)
-#endif // __INTELC__/!__INTELC__
-
+// this file is currently empty as its original contents was moved to
+// include/wx/private/fd.h but let's keep it for now in case we need it for
+// something again in the future
+#include "wx/private/fd.h"
 
 #endif // _WX_UNIX_PRIVATE_H_