some Motif compilation fixes

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

diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index 9536891b3863a2288212bde3af92799c3ce14aac..c88d5fd19c669da1b9a5f04edaf11de37b8bc877 100644 (file)
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -20,7 +20,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

-#include "wx/setup.h"
+
+#if wxUSE_SOCKETS
+

 #include "wx/ipcbase.h"
 #include "wx/socket.h"
 #include "wx/sckstrm.h"
 #include "wx/ipcbase.h"
 #include "wx/socket.h"
 #include "wx/sckstrm.h"


@@ -136,4 +138,6 @@ public:
   virtual wxConnectionBase *OnMakeConnection();
 };
 
   virtual wxConnectionBase *OnMakeConnection();
 };
 

+#endif // wxUSE_SOCKETS
+

 #endif // ipcsock.h
 #endif // ipcsock.h

diff --git a/src/motif/gsockmot.c b/src/motif/gsockmot.c
index 797c3cff7bc88d826fef7c3a7777b9f9c893ae78..0898bd4512158c420143f23a3a68825a10ef1eaa 100644 (file)
--- a/src/motif/gsockmot.c
+++ b/src/motif/gsockmot.c
@@ -117,4 +117,9 @@ void _GSocket_Disable_Events(GSocket *socket)
   _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT);
 }
 
   _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT);
 }
 

-#endif /* wxUSE_SOCKETS */
+#else /* !wxUSE_SOCKETS */
+
+/* some compilers don't like having empty source files */
+static int wxDummyGsockVar = 0;
+
+#endif /* wxUSE_SOCKETS/!wxUSE_SOCKETS */