merge of wxMac into main repository

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-09 11:14:15 +00:00
parent 05adb9d2fd
commit a02bb1438a
5 changed files with 18 additions and 6 deletions
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -18,7 +18,9 @@
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)

 #include <stddef.h>
+#ifndef __WXMAC__
 #include <sys/types.h>
+#endif

 #ifdef __cplusplus
 extern "C" {