From 60913641356f364a5efee5966d3a3b0b48c01001 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 28 Nov 2008 13:04:47 +0000 Subject: [PATCH] rename various gsock* files to sock* (except for MSW where this will be done later) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 248 +++++----- build/bakefiles/files.bkl | 35 +- include/wx/private/gsocket.h | 443 ------------------ include/wx/private/gsocketiohandler.h | 2 +- include/wx/private/socket.h | 416 +++++++++++++++- .../unix/{gsockunx.h => private/sockunix.h} | 2 +- src/common/sckaddr.cpp | 2 +- src/common/socket.cpp | 2 +- src/gtk/{gsockgtk.cpp => sockgtk.cpp} | 2 +- src/gtk1/{gsockgtk.cpp => sockgtk.cpp} | 2 +- src/motif/{gsockmot.cpp => sockmot.cpp} | 2 +- src/msw/gsocket.cpp | 2 +- src/msw/gsockmsw.cpp | 2 +- src/os2/{gsockpm.cpp => sockpm.cpp} | 2 +- src/osx/core/{gsockosx.cpp => sockosx.cpp} | 4 +- src/unix/{gsocket.cpp => sockunix.cpp} | 5 +- 16 files changed, 542 insertions(+), 629 deletions(-) delete mode 100644 include/wx/private/gsocket.h rename include/wx/unix/{gsockunx.h => private/sockunix.h} (99%) rename src/gtk/{gsockgtk.cpp => sockgtk.cpp} (98%) rename src/gtk1/{gsockgtk.cpp => sockgtk.cpp} (98%) rename src/motif/{gsockmot.cpp => sockmot.cpp} (98%) rename src/os2/{gsockpm.cpp => sockpm.cpp} (98%) rename src/osx/core/{gsockosx.cpp => sockosx.cpp} (99%) rename src/unix/{gsocket.cpp => sockunix.cpp} (99%) diff --git a/Makefile.in b/Makefile.in index 465a6d237f..225c4b4b71 100644 --- a/Makefile.in +++ b/Makefile.in @@ -444,7 +444,6 @@ ALL_BASE_HEADERS = \ wx/meta/movable.h \ $(BASE_PLATFORM_HDR) \ wx/fs_inet.h \ - wx/gsocket.h \ wx/protocol/file.h \ wx/protocol/ftp.h \ wx/protocol/http.h \ @@ -454,7 +453,6 @@ ALL_BASE_HEADERS = \ wx/sckstrm.h \ wx/socket.h \ wx/url.h \ - $(NET_PLATFORM_HDR) \ wx/xml/xml.h \ wx/xtixml.h ALL_HEADERS = \ @@ -610,8 +608,6 @@ ALL_PORTS_BASE_HEADERS = \ wx/unix/tls.h \ wx/unix/execute.h \ wx/unix/mimetype.h \ - wx/unix/private.h \ - wx/private/gsocketiohandler.h \ wx/msw/apptrait.h \ wx/msw/apptbase.h \ wx/msw/chkconf.h \ @@ -642,7 +638,6 @@ ALL_PORTS_BASE_HEADERS = \ wx/palmos/stdpaths.h \ wx/msdos/mimetype.h \ wx/fs_inet.h \ - wx/gsocket.h \ wx/protocol/file.h \ wx/protocol/ftp.h \ wx/protocol/http.h \ @@ -652,11 +647,6 @@ ALL_PORTS_BASE_HEADERS = \ wx/sckstrm.h \ wx/socket.h \ wx/url.h \ - wx/unix/gsockunx.h \ - wx/msw/gsockmsw.h \ - $(NET_WINCE_HDR) \ - wx/unix/gsockunx.h \ - wx/unix/gsockunx.h \ wx/xml/xml.h \ wx/xtixml.h ALL_BASE_SOURCES = \ @@ -815,8 +805,8 @@ ALL_BASE_SOURCES = \ src/common/sckstrm.cpp \ src/common/socket.cpp \ src/common/url.cpp \ - src/unix/gsocket.cpp \ - src/osx/core/gsockosx.cpp \ + src/unix/sockunix.cpp \ + src/osx/core/sockosx.cpp \ src/msw/gsocket.cpp \ src/msw/gsockmsw.cpp \ src/msw/urlmsw.cpp \ @@ -1930,7 +1920,6 @@ COND_USE_STC_1___wxscintilla___depname = \ @COND_TOOLKIT_WINCE@BASE_WINCE_HDR = wx/msw/wince/time.h \ @COND_TOOLKIT_WINCE@ wx/msw/wince/chkconf.h @COND_TOOLKIT_WINCE@NET_WINCE_SRC = src/msw/wince/net.cpp -@COND_TOOLKIT_WINCE@NET_WINCE_HDR = wx/msw/wince/net.h @COND_TOOLKIT_MSW@MSW_HTML_HDR = wx/msw/helpbest.h @COND_TOOLKIT_COCOA@OPENGL_HDR_PLATFORM = wx/cocoa/glcanvas.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@OPENGL_HDR_PLATFORM \ @@ -2097,7 +2086,6 @@ COND_TOOLKIT__BASE_OSX_HDR = \ wx/unix/tls.h \ wx/unix/execute.h \ wx/unix/mimetype.h \ - wx/unix/private.h \ wx/osx/core/cfdataref.h \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ @@ -2120,7 +2108,6 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR = \ wx/unix/tls.h \ wx/unix/execute.h \ wx/unix/mimetype.h \ - wx/unix/private.h \ wx/osx/core/cfdataref.h \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ @@ -2143,7 +2130,6 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR = \ wx/unix/tls.h \ wx/unix/execute.h \ wx/unix/mimetype.h \ - wx/unix/private.h \ wx/osx/core/cfdataref.h \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ @@ -2166,7 +2152,6 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \ wx/unix/tls.h \ wx/unix/execute.h \ wx/unix/mimetype.h \ - wx/unix/private.h \ wx/osx/core/cfdataref.h \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ @@ -2229,7 +2214,6 @@ COND_TOOLKIT_X11_BASE_OSX_HDR = \ wx/unix/tls.h \ wx/unix/execute.h \ wx/unix/mimetype.h \ - wx/unix/private.h \ wx/osx/core/cfdataref.h \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ @@ -2241,9 +2225,6 @@ COND_TOOLKIT_X11_BASE_OSX_HDR = \ @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR) @COND_PLATFORM_MSDOS_1@BASE_PLATFORM_HDR = wx/msdos/mimetype.h COND_PLATFORM_OS2_1_BASE_PLATFORM_HDR = \ - wx/private/fdiodispatcher.h \ - wx/private/selectdispatcher.h \ - wx/private/gsocketiohandler.h \ wx/unix/app.h \ wx/os2/apptbase.h \ wx/os2/apptrait.h \ @@ -2267,9 +2248,7 @@ COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \ wx/unix/stackwalk.h \ wx/unix/tls.h \ wx/unix/execute.h \ - wx/unix/mimetype.h \ - wx/unix/private.h \ - wx/private/gsocketiohandler.h + wx/unix/mimetype.h @COND_PLATFORM_UNIX_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR) COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR = \ wx/msw/apptrait.h \ @@ -2294,11 +2273,6 @@ COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR = \ wx/msw/wrapwin.h \ $(BASE_WINCE_HDR) @COND_PLATFORM_WIN32_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR) -@COND_PLATFORM_MACOSX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h -@COND_PLATFORM_OS2_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h -@COND_PLATFORM_UNIX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h -@COND_PLATFORM_WIN32_1@NET_PLATFORM_HDR = \ -@COND_PLATFORM_WIN32_1@ wx/msw/gsockmsw.h $(NET_WINCE_HDR) @COND_TOOLKIT_COCOA@LOWLEVEL_HDR = COND_TOOLKIT_DFB_LOWLEVEL_HDR = \ wx/generic/caret.h \ @@ -4062,11 +4036,11 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS \ @COND_TOOLKIT_OSX_COCOA@ = monodll_osx_cocoa_utils.o @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS \ -@COND_PLATFORM_MACOSX_1@ = monodll_unix_gsocket.o monodll_gsockosx.o -@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS = monodll_unix_gsocket.o -@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_unix_gsocket.o +@COND_PLATFORM_MACOSX_1@ = monodll_sockunix.o monodll_sockosx.o +@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS = monodll_sockunix.o +@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_sockunix.o COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS = \ - monodll_msw_gsocket.o \ + monodll_gsocket.o \ monodll_gsockmsw.o \ monodll_urlmsw.o \ $(__NET_WINCE_SRC_OBJECTS) @@ -4565,7 +4539,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS = \ monodll_gtk1_dnd.o \ monodll_gtk1_evtloop.o \ monodll_gtk1_font.o \ - monodll_gtk1_gsockgtk.o \ + monodll_gtk1_sockgtk.o \ monodll_gtk1_main.o \ monodll_gtk1_minifram.o \ monodll_gtk1_pen.o \ @@ -4606,7 +4580,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS = \ monodll_gtk_evtloop.o \ monodll_filectrl.o \ monodll_gtk_font.o \ - monodll_gtk_gsockgtk.o \ + monodll_gtk_sockgtk.o \ monodll_gtk_minifram.o \ monodll_gtk_pen.o \ monodll_gtk_popupwin.o \ @@ -5030,7 +5004,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ monodll_motif_font.o \ monodll_motif_frame.o \ monodll_motif_gauge.o \ - monodll_gsockmot.o \ + monodll_sockmot.o \ monodll_motif_icon.o \ monodll_motif_listbox.o \ monodll_motif_main.o \ @@ -5266,7 +5240,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS = \ monodll_os2_frame.o \ monodll_os2_gauge.o \ monodll_os2_gdiimage.o \ - monodll_gsockpm.o \ + monodll_sockpm.o \ monodll_os2_helpwin.o \ monodll_os2_icon.o \ monodll_os2_iniconf.o \ @@ -5431,7 +5405,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_1 = \ monodll_gtk1_dnd.o \ monodll_gtk1_evtloop.o \ monodll_gtk1_font.o \ - monodll_gtk1_gsockgtk.o \ + monodll_gtk1_sockgtk.o \ monodll_gtk1_main.o \ monodll_gtk1_minifram.o \ monodll_gtk1_pen.o \ @@ -5472,7 +5446,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_gtk_evtloop.o \ monodll_filectrl.o \ monodll_gtk_font.o \ - monodll_gtk_gsockgtk.o \ + monodll_gtk_sockgtk.o \ monodll_gtk_minifram.o \ monodll_gtk_pen.o \ monodll_gtk_popupwin.o \ @@ -5874,11 +5848,11 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 \ @COND_TOOLKIT_OSX_COCOA@ = monolib_osx_cocoa_utils.o @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_1 \ -@COND_PLATFORM_MACOSX_1@ = monolib_unix_gsocket.o monolib_gsockosx.o -@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_unix_gsocket.o -@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_unix_gsocket.o +@COND_PLATFORM_MACOSX_1@ = monolib_sockunix.o monolib_sockosx.o +@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_sockunix.o +@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_sockunix.o COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS_1 = \ - monolib_msw_gsocket.o \ + monolib_gsocket.o \ monolib_gsockmsw.o \ monolib_urlmsw.o \ $(__NET_WINCE_SRC_OBJECTS_1) @@ -6377,7 +6351,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_2 = \ monolib_gtk1_dnd.o \ monolib_gtk1_evtloop.o \ monolib_gtk1_font.o \ - monolib_gtk1_gsockgtk.o \ + monolib_gtk1_sockgtk.o \ monolib_gtk1_main.o \ monolib_gtk1_minifram.o \ monolib_gtk1_pen.o \ @@ -6418,7 +6392,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_gtk_evtloop.o \ monolib_filectrl.o \ monolib_gtk_font.o \ - monolib_gtk_gsockgtk.o \ + monolib_gtk_sockgtk.o \ monolib_gtk_minifram.o \ monolib_gtk_pen.o \ monolib_gtk_popupwin.o \ @@ -6842,7 +6816,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ monolib_motif_font.o \ monolib_motif_frame.o \ monolib_motif_gauge.o \ - monolib_gsockmot.o \ + monolib_sockmot.o \ monolib_motif_icon.o \ monolib_motif_listbox.o \ monolib_motif_main.o \ @@ -7078,7 +7052,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 = \ monolib_os2_frame.o \ monolib_os2_gauge.o \ monolib_os2_gdiimage.o \ - monolib_gsockpm.o \ + monolib_sockpm.o \ monolib_os2_helpwin.o \ monolib_os2_icon.o \ monolib_os2_iniconf.o \ @@ -7243,7 +7217,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_3 = \ monolib_gtk1_dnd.o \ monolib_gtk1_evtloop.o \ monolib_gtk1_font.o \ - monolib_gtk1_gsockgtk.o \ + monolib_gtk1_sockgtk.o \ monolib_gtk1_main.o \ monolib_gtk1_minifram.o \ monolib_gtk1_pen.o \ @@ -7284,7 +7258,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_gtk_evtloop.o \ monolib_filectrl.o \ monolib_gtk_font.o \ - monolib_gtk_gsockgtk.o \ + monolib_gtk_sockgtk.o \ monolib_gtk_minifram.o \ monolib_gtk_pen.o \ monolib_gtk_popupwin.o \ @@ -7869,11 +7843,11 @@ COND_USE_SOSYMLINKS_1___netdll___so_symlinks_uninst_cmd = rm -f \ @COND_USE_SOSYMLINKS_1@__netdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___netdll___so_symlinks_uninst_cmd) @COND_PLATFORM_WIN32_1@__netdll___win32rc = netdll_version_rc.o @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 \ -@COND_PLATFORM_MACOSX_1@ = netdll_unix_gsocket.o netdll_gsockosx.o -@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_unix_gsocket.o -@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_unix_gsocket.o +@COND_PLATFORM_MACOSX_1@ = netdll_sockunix.o netdll_sockosx.o +@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_sockunix.o +@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_sockunix.o COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS_2 = \ - netdll_msw_gsocket.o \ + netdll_gsocket.o \ netdll_gsockmsw.o \ netdll_urlmsw.o \ $(__NET_WINCE_SRC_OBJECTS_2) @@ -7890,11 +7864,11 @@ COND_MONOLITHIC_0_SHARED_0___netlib___depname = \ @COND_USE_PCH_1@_____pch_wxprec_netlib_wx_wxprec_h_gch___depname \ @COND_USE_PCH_1@ = ./.pch/wxprec_netlib/wx/wxprec.h.gch @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_3 \ -@COND_PLATFORM_MACOSX_1@ = netlib_unix_gsocket.o netlib_gsockosx.o -@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_unix_gsocket.o -@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_unix_gsocket.o +@COND_PLATFORM_MACOSX_1@ = netlib_sockunix.o netlib_sockosx.o +@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_sockunix.o +@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_sockunix.o COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS_3 = \ - netlib_msw_gsocket.o \ + netlib_gsocket.o \ netlib_gsockmsw.o \ netlib_urlmsw.o \ $(__NET_WINCE_SRC_OBJECTS_3) @@ -8339,7 +8313,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_4 = \ coredll_gtk1_dnd.o \ coredll_gtk1_evtloop.o \ coredll_gtk1_font.o \ - coredll_gtk1_gsockgtk.o \ + coredll_gtk1_sockgtk.o \ coredll_gtk1_main.o \ coredll_gtk1_minifram.o \ coredll_gtk1_pen.o \ @@ -8380,7 +8354,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_gtk_evtloop.o \ coredll_filectrl.o \ coredll_gtk_font.o \ - coredll_gtk_gsockgtk.o \ + coredll_gtk_sockgtk.o \ coredll_gtk_minifram.o \ coredll_gtk_pen.o \ coredll_gtk_popupwin.o \ @@ -8804,7 +8778,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ coredll_motif_font.o \ coredll_motif_frame.o \ coredll_motif_gauge.o \ - coredll_gsockmot.o \ + coredll_sockmot.o \ coredll_motif_icon.o \ coredll_motif_listbox.o \ coredll_motif_main.o \ @@ -9040,7 +9014,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 = \ coredll_os2_frame.o \ coredll_os2_gauge.o \ coredll_os2_gdiimage.o \ - coredll_gsockpm.o \ + coredll_sockpm.o \ coredll_os2_helpwin.o \ coredll_os2_icon.o \ coredll_os2_iniconf.o \ @@ -9205,7 +9179,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_5 = \ coredll_gtk1_dnd.o \ coredll_gtk1_evtloop.o \ coredll_gtk1_font.o \ - coredll_gtk1_gsockgtk.o \ + coredll_gtk1_sockgtk.o \ coredll_gtk1_main.o \ coredll_gtk1_minifram.o \ coredll_gtk1_pen.o \ @@ -9246,7 +9220,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_gtk_evtloop.o \ coredll_filectrl.o \ coredll_gtk_font.o \ - coredll_gtk_gsockgtk.o \ + coredll_gtk_sockgtk.o \ coredll_gtk_minifram.o \ coredll_gtk_pen.o \ coredll_gtk_popupwin.o \ @@ -9843,7 +9817,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_6 = \ corelib_gtk1_dnd.o \ corelib_gtk1_evtloop.o \ corelib_gtk1_font.o \ - corelib_gtk1_gsockgtk.o \ + corelib_gtk1_sockgtk.o \ corelib_gtk1_main.o \ corelib_gtk1_minifram.o \ corelib_gtk1_pen.o \ @@ -9884,7 +9858,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_gtk_evtloop.o \ corelib_filectrl.o \ corelib_gtk_font.o \ - corelib_gtk_gsockgtk.o \ + corelib_gtk_sockgtk.o \ corelib_gtk_minifram.o \ corelib_gtk_pen.o \ corelib_gtk_popupwin.o \ @@ -10308,7 +10282,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ corelib_motif_font.o \ corelib_motif_frame.o \ corelib_motif_gauge.o \ - corelib_gsockmot.o \ + corelib_sockmot.o \ corelib_motif_icon.o \ corelib_motif_listbox.o \ corelib_motif_main.o \ @@ -10544,7 +10518,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 = \ corelib_os2_frame.o \ corelib_os2_gauge.o \ corelib_os2_gdiimage.o \ - corelib_gsockpm.o \ + corelib_sockpm.o \ corelib_os2_helpwin.o \ corelib_os2_icon.o \ corelib_os2_iniconf.o \ @@ -10709,7 +10683,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_7 = \ corelib_gtk1_dnd.o \ corelib_gtk1_evtloop.o \ corelib_gtk1_font.o \ - corelib_gtk1_gsockgtk.o \ + corelib_gtk1_sockgtk.o \ corelib_gtk1_main.o \ corelib_gtk1_minifram.o \ corelib_gtk1_pen.o \ @@ -10750,7 +10724,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_gtk_evtloop.o \ corelib_filectrl.o \ corelib_gtk_font.o \ - corelib_gtk_gsockgtk.o \ + corelib_gtk_sockgtk.o \ corelib_gtk_minifram.o \ corelib_gtk_pen.o \ corelib_gtk_popupwin.o \ @@ -14530,7 +14504,7 @@ monodll_socket.o: $(srcdir)/src/common/socket.cpp $(MONODLL_ODEP) monodll_url.o: $(srcdir)/src/common/url.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/url.cpp -monodll_msw_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONODLL_ODEP) +monodll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONODLL_ODEP) @@ -14542,8 +14516,8 @@ monodll_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(MONODLL_ODEP) monodll_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp -monodll_gsockosx.o: $(srcdir)/src/osx/core/gsockosx.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/gsockosx.cpp +monodll_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp monodll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp @@ -14851,8 +14825,8 @@ monodll_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(MONODLL_ODEP) monodll_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp -monodll_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp +monodll_sockmot.o: $(srcdir)/src/motif/sockmot.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/sockmot.cpp monodll_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp @@ -15478,8 +15452,8 @@ monodll_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(MONODLL_ODEP) monodll_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp -monodll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp +monodll_sockpm.o: $(srcdir)/src/os2/sockpm.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/sockpm.cpp monodll_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp @@ -16183,14 +16157,14 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_OS2_1@monodll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONODLL_ODEP) @COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp -@COND_PLATFORM_UNIX_1@monodll_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP) -@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp +@COND_PLATFORM_UNIX_1@monodll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONODLL_ODEP) +@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp -@COND_PLATFORM_MACOSX_1@monodll_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP) -@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp +@COND_PLATFORM_MACOSX_1@monodll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp -@COND_PLATFORM_OS2_1@monodll_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp +@COND_PLATFORM_OS2_1@monodll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONODLL_ODEP) +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp @COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP) @COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp @@ -16378,8 +16352,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/font.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_sockgtk.o: $(srcdir)/src/gtk/sockgtk.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/sockgtk.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp @@ -16465,8 +16439,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_font.o: $(srcdir)/src/gtk1/font.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_sockgtk.o: $(srcdir)/src/gtk1/sockgtk.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/sockgtk.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_main.o: $(srcdir)/src/gtk1/main.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp @@ -19210,7 +19184,7 @@ monolib_socket.o: $(srcdir)/src/common/socket.cpp $(MONOLIB_ODEP) monolib_url.o: $(srcdir)/src/common/url.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/url.cpp -monolib_msw_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONOLIB_ODEP) +monolib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONOLIB_ODEP) @@ -19222,8 +19196,8 @@ monolib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(MONOLIB_ODEP) monolib_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp -monolib_gsockosx.o: $(srcdir)/src/osx/core/gsockosx.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/gsockosx.cpp +monolib_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp monolib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp @@ -19531,8 +19505,8 @@ monolib_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(MONOLIB_ODEP) monolib_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp -monolib_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp +monolib_sockmot.o: $(srcdir)/src/motif/sockmot.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/sockmot.cpp monolib_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp @@ -20158,8 +20132,8 @@ monolib_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(MONOLIB_ODEP) monolib_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp -monolib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp +monolib_sockpm.o: $(srcdir)/src/os2/sockpm.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/sockpm.cpp monolib_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp @@ -20863,14 +20837,14 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_OS2_1@monolib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONOLIB_ODEP) @COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp -@COND_PLATFORM_UNIX_1@monolib_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp +@COND_PLATFORM_UNIX_1@monolib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp -@COND_PLATFORM_MACOSX_1@monolib_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp +@COND_PLATFORM_MACOSX_1@monolib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp -@COND_PLATFORM_OS2_1@monolib_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp +@COND_PLATFORM_OS2_1@monolib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp @COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp @@ -21058,8 +21032,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/font.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_sockgtk.o: $(srcdir)/src/gtk/sockgtk.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/sockgtk.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp @@ -21145,8 +21119,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_font.o: $(srcdir)/src/gtk1/font.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_sockgtk.o: $(srcdir)/src/gtk1/sockgtk.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/sockgtk.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_main.o: $(srcdir)/src/gtk1/main.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp @@ -24454,7 +24428,7 @@ netdll_socket.o: $(srcdir)/src/common/socket.cpp $(NETDLL_ODEP) netdll_url.o: $(srcdir)/src/common/url.cpp $(NETDLL_ODEP) $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/url.cpp -netdll_msw_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETDLL_ODEP) +netdll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETDLL_ODEP) $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp netdll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(NETDLL_ODEP) @@ -24466,17 +24440,17 @@ netdll_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETDLL_ODEP) netdll_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETDLL_ODEP) $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp -netdll_gsockosx.o: $(srcdir)/src/osx/core/gsockosx.cpp $(NETDLL_ODEP) - $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/osx/core/gsockosx.cpp +netdll_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(NETDLL_ODEP) + $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp -@COND_PLATFORM_UNIX_1@netdll_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP) -@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp +@COND_PLATFORM_UNIX_1@netdll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETDLL_ODEP) +@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp -@COND_PLATFORM_MACOSX_1@netdll_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP) -@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp +@COND_PLATFORM_MACOSX_1@netdll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETDLL_ODEP) +@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp -@COND_PLATFORM_OS2_1@netdll_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp +@COND_PLATFORM_OS2_1@netdll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETDLL_ODEP) +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp netlib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETLIB_ODEP) $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp @@ -24508,7 +24482,7 @@ netlib_socket.o: $(srcdir)/src/common/socket.cpp $(NETLIB_ODEP) netlib_url.o: $(srcdir)/src/common/url.cpp $(NETLIB_ODEP) $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/common/url.cpp -netlib_msw_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETLIB_ODEP) +netlib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETLIB_ODEP) $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp netlib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(NETLIB_ODEP) @@ -24520,17 +24494,17 @@ netlib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETLIB_ODEP) netlib_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETLIB_ODEP) $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp -netlib_gsockosx.o: $(srcdir)/src/osx/core/gsockosx.cpp $(NETLIB_ODEP) - $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/osx/core/gsockosx.cpp +netlib_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(NETLIB_ODEP) + $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp -@COND_PLATFORM_UNIX_1@netlib_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP) -@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp +@COND_PLATFORM_UNIX_1@netlib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETLIB_ODEP) +@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp -@COND_PLATFORM_MACOSX_1@netlib_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP) -@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp +@COND_PLATFORM_MACOSX_1@netlib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETLIB_ODEP) +@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp -@COND_PLATFORM_OS2_1@netlib_unix_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP) -@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp +@COND_PLATFORM_OS2_1@netlib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETLIB_ODEP) +@COND_PLATFORM_OS2_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP) $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_58) $(__INC_TIFF_p_58) $(__INC_JPEG_p_58) $(__INC_PNG_p_57) $(__INC_ZLIB_p_59) $(__INC_REGEX_p_57) $(__INC_EXPAT_p_57) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 @@ -24874,8 +24848,8 @@ coredll_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(COREDLL_ODEP) coredll_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp -coredll_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp +coredll_sockmot.o: $(srcdir)/src/motif/sockmot.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/sockmot.cpp coredll_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp @@ -25501,8 +25475,8 @@ coredll_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(COREDLL_ODEP) coredll_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp -coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(COREDLL_ODEP) - $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp +coredll_sockpm.o: $(srcdir)/src/os2/sockpm.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/sockpm.cpp coredll_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp @@ -25927,8 +25901,8 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/font.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_sockgtk.o: $(srcdir)/src/gtk/sockgtk.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/sockgtk.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp @@ -26014,8 +25988,8 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_font.o: $(srcdir)/src/gtk1/font.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_sockgtk.o: $(srcdir)/src/gtk1/sockgtk.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/sockgtk.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_main.o: $(srcdir)/src/gtk1/main.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp @@ -28381,8 +28355,8 @@ corelib_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(CORELIB_ODEP) corelib_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp -corelib_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp +corelib_sockmot.o: $(srcdir)/src/motif/sockmot.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/sockmot.cpp corelib_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp @@ -29008,8 +28982,8 @@ corelib_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(CORELIB_ODEP) corelib_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp -corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(CORELIB_ODEP) - $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp +corelib_sockpm.o: $(srcdir)/src/os2/sockpm.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/sockpm.cpp corelib_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp @@ -29434,8 +29408,8 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/font.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_sockgtk.o: $(srcdir)/src/gtk/sockgtk.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/sockgtk.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp @@ -29521,8 +29495,8 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_font.o: $(srcdir)/src/gtk1/font.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_sockgtk.o: $(srcdir)/src/gtk1/sockgtk.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/sockgtk.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_main.o: $(srcdir)/src/gtk1/main.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 1b39471656..084b122472 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -99,7 +99,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(BASE_UNIX_AND_DARWIN_HDR) wx/unix/execute.h wx/unix/mimetype.h - wx/unix/private.h @@ -249,9 +247,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - wx/private/fdiodispatcher.h - wx/private/selectdispatcher.h - wx/private/gsocketiohandler.h wx/unix/app.h wx/os2/apptbase.h wx/os2/apptrait.h @@ -540,14 +535,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - src/unix/gsocket.cpp - - - wx/unix/gsockunx.h + src/unix/sockunix.cpp - src/osx/core/gsockosx.cpp + src/osx/core/sockosx.cpp @@ -567,10 +559,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! - src/unix/gsocket.cpp - - - wx/unix/gsockunx.h + src/unix/sockunix.cpp @@ -587,7 +576,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/fs_inet.h - wx/gsocket.h wx/protocol/file.h wx/protocol/ftp.h wx/protocol/http.h @@ -999,7 +987,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk/evtloop.cpp src/gtk/filectrl.cpp src/gtk/font.cpp - src/gtk/gsockgtk.cpp + src/gtk/sockgtk.cpp src/gtk/minifram.cpp src/gtk/pen.cpp src/gtk/popupwin.cpp @@ -1183,7 +1171,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk1/dnd.cpp src/gtk1/evtloop.cpp src/gtk1/font.cpp - src/gtk1/gsockgtk.cpp + src/gtk1/sockgtk.cpp src/gtk1/main.cpp src/gtk1/minifram.cpp src/gtk1/pen.cpp @@ -1373,7 +1361,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/motif/font.cpp src/motif/frame.cpp src/motif/gauge.cpp - src/motif/gsockmot.cpp + src/motif/sockmot.cpp src/motif/icon.cpp src/motif/listbox.cpp src/motif/main.cpp @@ -2034,7 +2022,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/os2/frame.cpp src/os2/gauge.cpp src/os2/gdiimage.cpp - src/os2/gsockpm.cpp + src/os2/sockpm.cpp src/os2/helpwin.cpp src/os2/icon.cpp src/os2/iniconf.cpp @@ -3622,10 +3610,7 @@ src/osx/iphone/window.mm $(NET_OS2_SRC) - $(NET_UNIX_HDR) $(NET_WIN32_HDR) $(NET_WINCE_HDR) - $(NET_OS2_HDR) - $(NET_UNIX_HDR) @@ -3795,7 +3780,7 @@ src/osx/iphone/window.mm $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR) - $(NET_CMN_HDR) $(NET_PLATFORM_HDR) + $(NET_CMN_HDR) $(XML_HDR) @@ -3812,10 +3797,6 @@ src/osx/iphone/window.mm $(BASE_PALMOS_HDR) $(BASE_MSDOS_HDR) $(NET_CMN_HDR) - $(NET_UNIX_HDR) - $(NET_WIN32_HDR) $(NET_WINCE_HDR) - $(NET_OS2_HDR) - $(NET_UNIX_HDR) $(XML_HDR) diff --git a/include/wx/private/gsocket.h b/include/wx/private/gsocket.h deleted file mode 100644 index c70fab4168..0000000000 --- a/include/wx/private/gsocket.h +++ /dev/null @@ -1,443 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/private/gsocket.h -// Purpose: wxSocketImpl nd related declarations -// Authors: Guilhem Lavaux, Vadim Zeitlin -// Created: April 1997 -// RCS-ID: $Id$ -// Copyright: (c) 1997 Guilhem Lavaux -// (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -/* - Brief overview of different socket classes: - - - wxSocketBase is the public class representing a socket ("Base" here - refers to the fact that wxSocketClient and wxSocketServer are derived - from it and predates the convention of using "Base" for common base - classes for platform-specific classes in wxWidgets) with implementation - common to all platforms and forwarding methods whose implementation - differs between platforms to wxSocketImpl which it contains. - - - wxSocketImpl is actually just an abstract base class having only code - common to all platforms, the concrete implementation classes derive from - it and are created by wxSocketManager::CreateSocket(). - - - Some socket operations have different implementations in console-mode and - GUI applications. wxSocketManager class exists to abstract this in such - way that console applications (using wxBase) don't depend on wxNet. An - object of this class is made available via wxApp and GUI applications set - up a different kind of global socket manager from console ones. - - TODO: it looks like wxSocketManager could be eliminated by providing - methods for registering/unregistering sockets directly in - wxEventLoop. - */ - -#ifndef _WX_PRIVATE_GSOCKET_H_ -#define _WX_PRIVATE_GSOCKET_H_ - -#include "wx/defs.h" - -#if wxUSE_SOCKETS - -#include "wx/socket.h" - -#include - -/* - Including sys/types.h under Cygwin results in the warnings about "fd_set - having been defined in sys/types.h" when winsock.h is included later and - doesn't seem to be necessary anyhow. It's not needed under Mac neither. - */ -#if !defined(__WXMAC__) && !defined(__CYGWIN__) && !defined(__WXWINCE__) -#include -#endif - -#ifdef __WXWINCE__ -#include -#endif - -// include the header defining timeval: under Windows this struct is used only -// with sockets so we need to include winsock.h which we do via windows.h -#ifdef __WXMSW__ - #include "wx/msw/wrapwin.h" -#else - #include // for timeval -#endif - -// these definitions are for MSW when we don't use configure, otherwise these -// symbols are defined by configure -#ifndef WX_SOCKLEN_T - #define WX_SOCKLEN_T int -#endif - -#ifndef SOCKOPTLEN_T - #define SOCKOPTLEN_T int -#endif - -// define some symbols which winsock.h defines but traditional BSD headers -// don't -#ifndef SOCKET - #define SOCKET int -#endif - -#ifndef INVALID_SOCKET - #define INVALID_SOCKET (-1) -#endif - -#ifndef SOCKET_ERROR - #define SOCKET_ERROR (-1) -#endif - -#if wxUSE_IPV6 - typedef struct sockaddr_storage wxSockAddr; -#else - typedef struct sockaddr wxSockAddr; -#endif - -enum GAddressType -{ - wxSOCKET_NOFAMILY = 0, - wxSOCKET_INET, - wxSOCKET_INET6, - wxSOCKET_UNIX -}; - -typedef int wxSocketEventFlags; - -struct GAddress; -class wxSocketImpl; - -/* - Class providing hooks abstracting the differences between console and GUI - applications for socket code. - - We also have different implementations of this class for different platforms - allowing us to keep more things in the common code but the main reason for - its existence is that we want the same socket code work differently - depending on whether it's used from a console or a GUI program. This is - achieved by implementing the virtual methods of this class differently in - the objects returned by wxConsoleAppTraits::GetSocketManager() and the same - method in wxGUIAppTraits. - */ -class wxSocketManager -{ -public: - // set the manager to use, we don't take ownership of it - // - // this should be called before creating the first wxSocket object, - // otherwise the manager returned by wxAppTraits::GetSocketManager() will - // be used - static void Set(wxSocketManager *manager); - - // return the manager to use - // - // this initializes the manager at first use - static wxSocketManager *Get() - { - if ( !ms_manager ) - Init(); - - return ms_manager; - } - - // called before the first wxSocket is created and should do the - // initializations needed in order to use the network - // - // return true if initialized successfully; if this returns false sockets - // can't be used at all - virtual bool OnInit() = 0; - - // undo the initializations of OnInit() - virtual void OnExit() = 0; - - - // create a concrete socket implementation associated with the given - // wxSocket object - // - // the returned object must be deleted by the caller - virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket) = 0; - - - - // these functions enable or disable monitoring of the given socket for the - // specified events inside the currently running event loop (but notice - // that both BSD and Winsock implementations actually use socket->m_server - // value to determine what exactly should be monitored so it needs to be - // set before calling these functions) - virtual void Install_Callback(wxSocketImpl *socket, - wxSocketNotify event = wxSOCKET_MAX_EVENT) = 0; - virtual void Uninstall_Callback(wxSocketImpl *socket, - wxSocketNotify event = wxSOCKET_MAX_EVENT) = 0; - - virtual ~wxSocketManager() { } - -private: - // get the manager to use if we don't have it yet - static void Init(); - - static wxSocketManager *ms_manager; -}; - -/* - Base class for all socket implementations providing functionality common to - BSD and Winsock sockets. - - Objects of this class are not created directly but only via its static - Create() method which in turn forwards to wxSocketManager::CreateSocket(). - */ -class wxSocketImpl -{ -public: - // static factory function: creates the low-level socket associated with - // the given wxSocket (and inherits its attributes such as timeout) - static wxSocketImpl *Create(wxSocketBase& wxsocket); - - virtual ~wxSocketImpl(); - - // set various socket properties: all of those can only be called before - // creating the socket - void SetTimeout(unsigned long millisec); - void SetNonBlocking(bool non_blocking) { m_non_blocking = non_blocking; } - void SetReusable() { m_reusable = true; } - void SetBroadcast() { m_broadcast = true; } - void DontDoBind() { m_dobind = false; } - void SetInitialSocketBuffers(int recv, int send) - { - m_initialRecvBufferSize = recv; - m_initialSendBufferSize = send; - } - - wxSocketError SetLocal(GAddress *address); - wxSocketError SetPeer(GAddress *address); - - // accessors - // --------- - - GAddress *GetLocal(); - GAddress *GetPeer(); - - wxSocketError GetError() const { return m_error; } - bool IsOk() const { return m_error == wxSOCKET_NOERROR; } - - - // creating/closing the socket - // -------------------------- - - // notice that SetLocal() must be called before creating the socket using - // any of the functions below - // - // all of Create() functions return wxSOCKET_NOERROR if the operation - // completed successfully or one of: - // wxSOCKET_INVSOCK - the socket is in use. - // wxSOCKET_INVADDR - the local (server) or peer (client) address has not - // been set. - // wxSOCKET_IOERR - any other error. - - // create a socket listening on the local address specified by SetLocal() - // (notice that DontDoBind() is ignored by this function) - wxSocketError CreateServer(); - - // create a socket connected to the peer address specified by SetPeer() - // (notice that DontDoBind() is ignored by this function) - // - // this function may return wxSOCKET_WOULDBLOCK in addition to the return - // values listed above - wxSocketError CreateClient(); - - // create (and bind unless DontDoBind() had been called) an UDP socket - // associated with the given local address - wxSocketError CreateUDP(); - - // may be called whether the socket was created or not, calls DoClose() if - // it was indeed created - void Close(); - - virtual void Shutdown(); - - - // IO operations - // ------------- - - virtual int Read(char *buffer, int size) = 0; - virtual int Write(const char *buffer, int size) = 0; - - wxSocketEventFlags Select(wxSocketEventFlags flags); - - virtual wxSocketImpl *WaitConnection(wxSocketBase& wxsocket) = 0; - - - // notifications - // ------------- - - // notify m_wxsocket about the given socket event by calling its (inaptly - // named) OnRequest() method - void NotifyOnStateChange(wxSocketNotify event); - - // FIXME: making these functions virtual is a hack necessary to make the - // wxBase library link without requiring wxNet under Unix where - // wxSocketSelectManager (part of wxBase) uses them, they don't - // really need to be virtual at all - virtual void Detected_Read() { } - virtual void Detected_Write() { } - virtual void Notify(bool WXUNUSED(notify)) { } - - // TODO: make these fields protected and provide accessors for those of - // them that wxSocketBase really needs -//protected: - SOCKET m_fd; - - int m_initialRecvBufferSize; - int m_initialSendBufferSize; - - GAddress *m_local; - GAddress *m_peer; - wxSocketError m_error; - - bool m_non_blocking; - bool m_server; - bool m_stream; - bool m_establishing; - bool m_reusable; - bool m_broadcast; - bool m_dobind; - - struct timeval m_timeout; - - wxSocketEventFlags m_detected; - -protected: - wxSocketImpl(wxSocketBase& wxsocket); - -private: - // handle the given connect() return value (which may be 0 or EWOULDBLOCK - // or something else) - virtual wxSocketError DoHandleConnect(int ret) = 0; - - // called by Close() if we have a valid m_fd - virtual void DoClose() = 0; - - // put this socket into non-blocking mode and enable monitoring this socket - // as part of the event loop - virtual void UnblockAndRegisterWithEventLoop() = 0; - - // check that the socket wasn't created yet and that the given address - // (either m_local or m_peer depending on the socket kind) is valid and - // set m_error and return false if this is not the case - bool PreCreateCheck(GAddress *addr); - - // set the given socket option: this just wraps setsockopt(SOL_SOCKET) - int SetSocketOption(int optname, int optval) - { - // although modern Unix systems use "const void *" for the 4th - // parameter here, old systems and Winsock still use "const char *" - return setsockopt(m_fd, SOL_SOCKET, optname, - reinterpret_cast(&optval), - sizeof(optval)); - } - - // set the given socket option to true value: this is an even simpler - // wrapper for setsockopt(SOL_SOCKET) for boolean options - int EnableSocketOption(int optname) - { - return SetSocketOption(optname, 1); - } - - // apply the options to the (just created) socket and register it with the - // event loop by calling UnblockAndRegisterWithEventLoop() - void PostCreation(); - - // update local address after binding/connecting - wxSocketError UpdateLocalAddress(); - - - // set in ctor and never changed except that it's reset to NULL when the - // socket is shut down - wxSocketBase *m_wxsocket; - - DECLARE_NO_COPY_CLASS(wxSocketImpl) -}; - -#if defined(__WXMSW__) - #include "wx/msw/gsockmsw.h" -#else - #include "wx/unix/gsockunx.h" -#endif - - -/* GAddress */ - -// TODO: make GAddress a real class instead of this mix of C and C++ - -// Represents a socket endpoint, i.e. -- in spite of its name -- not an address -// but an (address, port) pair -struct GAddress -{ - struct sockaddr *m_addr; - size_t m_len; - - GAddressType m_family; - int m_realfamily; - - wxSocketError m_error; -}; - -GAddress *GAddress_new(); -GAddress *GAddress_copy(GAddress *address); -void GAddress_destroy(GAddress *address); - -void GAddress_SetFamily(GAddress *address, GAddressType type); -GAddressType GAddress_GetFamily(GAddress *address); - -/* The use of any of the next functions will set the address family to - * the specific one. For example if you use GAddress_INET_SetHostName, - * address family will be implicitly set to AF_INET. - */ - -wxSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname); -wxSocketError GAddress_INET_SetBroadcastAddress(GAddress *address); -wxSocketError GAddress_INET_SetAnyAddress(GAddress *address); -wxSocketError GAddress_INET_SetHostAddress(GAddress *address, - unsigned long hostaddr); -wxSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, - const char *protocol); -wxSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port); - -wxSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, - size_t sbuf); -unsigned long GAddress_INET_GetHostAddress(GAddress *address); -unsigned short GAddress_INET_GetPort(GAddress *address); - -wxSocketError _GAddress_translate_from(GAddress *address, - struct sockaddr *addr, int len); -wxSocketError _GAddress_translate_to (GAddress *address, - struct sockaddr **addr, int *len); -wxSocketError _GAddress_Init_INET(GAddress *address); - -#if wxUSE_IPV6 - -wxSocketError GAddress_INET6_SetHostName(GAddress *address, const char *hostname); -wxSocketError GAddress_INET6_SetAnyAddress(GAddress *address); -wxSocketError GAddress_INET6_SetHostAddress(GAddress *address, - struct in6_addr hostaddr); -wxSocketError GAddress_INET6_SetPortName(GAddress *address, const char *port, - const char *protocol); -wxSocketError GAddress_INET6_SetPort(GAddress *address, unsigned short port); - -wxSocketError GAddress_INET6_GetHostName(GAddress *address, char *hostname, - size_t sbuf); -wxSocketError GAddress_INET6_GetHostAddress(GAddress *address,struct in6_addr *hostaddr); -unsigned short GAddress_INET6_GetPort(GAddress *address); - -#endif // wxUSE_IPV6 - -// these functions are available under all platforms but only implemented under -// Unix ones, elsewhere they just return wxSOCKET_INVADDR -wxSocketError _GAddress_Init_UNIX(GAddress *address); -wxSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path); -wxSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf); - -#endif /* wxUSE_SOCKETS */ - -#endif /* _WX_PRIVATE_GSOCKET_H_ */ diff --git a/include/wx/private/gsocketiohandler.h b/include/wx/private/gsocketiohandler.h index 61ecbc2f7f..5fdee62b8a 100644 --- a/include/wx/private/gsocketiohandler.h +++ b/include/wx/private/gsocketiohandler.h @@ -16,7 +16,7 @@ #if wxUSE_SOCKETS && wxUSE_SELECT_DISPATCHER #include "wx/private/selectdispatcher.h" -#include "wx/private/gsocket.h" +#include "wx/private/socket.h" class WXDLLIMPEXP_BASE wxSocketIOHandler : public wxFDIOHandler { diff --git a/include/wx/private/socket.h b/include/wx/private/socket.h index 9b20bf60cc..03da655036 100644 --- a/include/wx/private/socket.h +++ b/include/wx/private/socket.h @@ -1,16 +1,71 @@ -/////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// // Name: wx/private/socket.h -// Purpose: various wxSocket-related private declarations -// Author: Vadim Zeitlin -// Created: 2008-11-23 +// Purpose: wxSocketImpl nd related declarations +// Authors: Guilhem Lavaux, Vadim Zeitlin +// Created: April 1997 // RCS-ID: $Id$ -// Copyright: (c) 2008 Vadim Zeitlin +// Copyright: (c) 1997 Guilhem Lavaux +// (c) 2008 Vadim Zeitlin // Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// + +/* + Brief overview of different socket classes: + + - wxSocketBase is the public class representing a socket ("Base" here + refers to the fact that wxSocketClient and wxSocketServer are derived + from it and predates the convention of using "Base" for common base + classes for platform-specific classes in wxWidgets) with implementation + common to all platforms and forwarding methods whose implementation + differs between platforms to wxSocketImpl which it contains. + + - wxSocketImpl is actually just an abstract base class having only code + common to all platforms, the concrete implementation classes derive from + it and are created by wxSocketManager::CreateSocket(). + + - Some socket operations have different implementations in console-mode and + GUI applications. wxSocketManager class exists to abstract this in such + way that console applications (using wxBase) don't depend on wxNet. An + object of this class is made available via wxApp and GUI applications set + up a different kind of global socket manager from console ones. + + TODO: it looks like wxSocketManager could be eliminated by providing + methods for registering/unregistering sockets directly in + wxEventLoop. + */ #ifndef _WX_PRIVATE_SOCKET_H_ #define _WX_PRIVATE_SOCKET_H_ +#include "wx/defs.h" + +#if wxUSE_SOCKETS + +#include "wx/socket.h" + +#include + +/* + Including sys/types.h under Cygwin results in the warnings about "fd_set + having been defined in sys/types.h" when winsock.h is included later and + doesn't seem to be necessary anyhow. It's not needed under Mac neither. + */ +#if !defined(__WXMAC__) && !defined(__CYGWIN__) && !defined(__WXWINCE__) +#include +#endif + +#ifdef __WXWINCE__ +#include +#endif + +// include the header defining timeval: under Windows this struct is used only +// with sockets so we need to include winsock.h which we do via windows.h +#ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" +#else + #include // for timeval +#endif + // these definitions are for MSW when we don't use configure, otherwise these // symbols are defined by configure #ifndef WX_SOCKLEN_T @@ -23,6 +78,10 @@ // define some symbols which winsock.h defines but traditional BSD headers // don't +#ifndef SOCKET + #define SOCKET int +#endif + #ifndef INVALID_SOCKET #define INVALID_SOCKET (-1) #endif @@ -37,5 +96,348 @@ typedef struct sockaddr wxSockAddr; #endif -#endif // _WX_PRIVATE_SOCKET_H_ +enum GAddressType +{ + wxSOCKET_NOFAMILY = 0, + wxSOCKET_INET, + wxSOCKET_INET6, + wxSOCKET_UNIX +}; + +typedef int wxSocketEventFlags; + +struct GAddress; +class wxSocketImpl; + +/* + Class providing hooks abstracting the differences between console and GUI + applications for socket code. + + We also have different implementations of this class for different platforms + allowing us to keep more things in the common code but the main reason for + its existence is that we want the same socket code work differently + depending on whether it's used from a console or a GUI program. This is + achieved by implementing the virtual methods of this class differently in + the objects returned by wxConsoleAppTraits::GetSocketManager() and the same + method in wxGUIAppTraits. + */ +class wxSocketManager +{ +public: + // set the manager to use, we don't take ownership of it + // + // this should be called before creating the first wxSocket object, + // otherwise the manager returned by wxAppTraits::GetSocketManager() will + // be used + static void Set(wxSocketManager *manager); + + // return the manager to use + // + // this initializes the manager at first use + static wxSocketManager *Get() + { + if ( !ms_manager ) + Init(); + + return ms_manager; + } + + // called before the first wxSocket is created and should do the + // initializations needed in order to use the network + // + // return true if initialized successfully; if this returns false sockets + // can't be used at all + virtual bool OnInit() = 0; + + // undo the initializations of OnInit() + virtual void OnExit() = 0; + + + // create a concrete socket implementation associated with the given + // wxSocket object + // + // the returned object must be deleted by the caller + virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket) = 0; + + + + // these functions enable or disable monitoring of the given socket for the + // specified events inside the currently running event loop (but notice + // that both BSD and Winsock implementations actually use socket->m_server + // value to determine what exactly should be monitored so it needs to be + // set before calling these functions) + virtual void Install_Callback(wxSocketImpl *socket, + wxSocketNotify event = wxSOCKET_MAX_EVENT) = 0; + virtual void Uninstall_Callback(wxSocketImpl *socket, + wxSocketNotify event = wxSOCKET_MAX_EVENT) = 0; + + virtual ~wxSocketManager() { } + +private: + // get the manager to use if we don't have it yet + static void Init(); + + static wxSocketManager *ms_manager; +}; + +/* + Base class for all socket implementations providing functionality common to + BSD and Winsock sockets. + + Objects of this class are not created directly but only via its static + Create() method which in turn forwards to wxSocketManager::CreateSocket(). + */ +class wxSocketImpl +{ +public: + // static factory function: creates the low-level socket associated with + // the given wxSocket (and inherits its attributes such as timeout) + static wxSocketImpl *Create(wxSocketBase& wxsocket); + + virtual ~wxSocketImpl(); + + // set various socket properties: all of those can only be called before + // creating the socket + void SetTimeout(unsigned long millisec); + void SetNonBlocking(bool non_blocking) { m_non_blocking = non_blocking; } + void SetReusable() { m_reusable = true; } + void SetBroadcast() { m_broadcast = true; } + void DontDoBind() { m_dobind = false; } + void SetInitialSocketBuffers(int recv, int send) + { + m_initialRecvBufferSize = recv; + m_initialSendBufferSize = send; + } + + wxSocketError SetLocal(GAddress *address); + wxSocketError SetPeer(GAddress *address); + + // accessors + // --------- + + GAddress *GetLocal(); + GAddress *GetPeer(); + + wxSocketError GetError() const { return m_error; } + bool IsOk() const { return m_error == wxSOCKET_NOERROR; } + + + // creating/closing the socket + // -------------------------- + + // notice that SetLocal() must be called before creating the socket using + // any of the functions below + // + // all of Create() functions return wxSOCKET_NOERROR if the operation + // completed successfully or one of: + // wxSOCKET_INVSOCK - the socket is in use. + // wxSOCKET_INVADDR - the local (server) or peer (client) address has not + // been set. + // wxSOCKET_IOERR - any other error. + + // create a socket listening on the local address specified by SetLocal() + // (notice that DontDoBind() is ignored by this function) + wxSocketError CreateServer(); + + // create a socket connected to the peer address specified by SetPeer() + // (notice that DontDoBind() is ignored by this function) + // + // this function may return wxSOCKET_WOULDBLOCK in addition to the return + // values listed above + wxSocketError CreateClient(); + + // create (and bind unless DontDoBind() had been called) an UDP socket + // associated with the given local address + wxSocketError CreateUDP(); + + // may be called whether the socket was created or not, calls DoClose() if + // it was indeed created + void Close(); + + virtual void Shutdown(); + + + // IO operations + // ------------- + + virtual int Read(char *buffer, int size) = 0; + virtual int Write(const char *buffer, int size) = 0; + + wxSocketEventFlags Select(wxSocketEventFlags flags); + + virtual wxSocketImpl *WaitConnection(wxSocketBase& wxsocket) = 0; + + + // notifications + // ------------- + + // notify m_wxsocket about the given socket event by calling its (inaptly + // named) OnRequest() method + void NotifyOnStateChange(wxSocketNotify event); + + // FIXME: making these functions virtual is a hack necessary to make the + // wxBase library link without requiring wxNet under Unix where + // wxSocketSelectManager (part of wxBase) uses them, they don't + // really need to be virtual at all + virtual void Detected_Read() { } + virtual void Detected_Write() { } + virtual void Notify(bool WXUNUSED(notify)) { } + + // TODO: make these fields protected and provide accessors for those of + // them that wxSocketBase really needs +//protected: + SOCKET m_fd; + + int m_initialRecvBufferSize; + int m_initialSendBufferSize; + + GAddress *m_local; + GAddress *m_peer; + wxSocketError m_error; + + bool m_non_blocking; + bool m_server; + bool m_stream; + bool m_establishing; + bool m_reusable; + bool m_broadcast; + bool m_dobind; + + struct timeval m_timeout; + + wxSocketEventFlags m_detected; + +protected: + wxSocketImpl(wxSocketBase& wxsocket); + +private: + // handle the given connect() return value (which may be 0 or EWOULDBLOCK + // or something else) + virtual wxSocketError DoHandleConnect(int ret) = 0; + + // called by Close() if we have a valid m_fd + virtual void DoClose() = 0; + + // put this socket into non-blocking mode and enable monitoring this socket + // as part of the event loop + virtual void UnblockAndRegisterWithEventLoop() = 0; + + // check that the socket wasn't created yet and that the given address + // (either m_local or m_peer depending on the socket kind) is valid and + // set m_error and return false if this is not the case + bool PreCreateCheck(GAddress *addr); + + // set the given socket option: this just wraps setsockopt(SOL_SOCKET) + int SetSocketOption(int optname, int optval) + { + // although modern Unix systems use "const void *" for the 4th + // parameter here, old systems and Winsock still use "const char *" + return setsockopt(m_fd, SOL_SOCKET, optname, + reinterpret_cast(&optval), + sizeof(optval)); + } + + // set the given socket option to true value: this is an even simpler + // wrapper for setsockopt(SOL_SOCKET) for boolean options + int EnableSocketOption(int optname) + { + return SetSocketOption(optname, 1); + } + + // apply the options to the (just created) socket and register it with the + // event loop by calling UnblockAndRegisterWithEventLoop() + void PostCreation(); + + // update local address after binding/connecting + wxSocketError UpdateLocalAddress(); + + + // set in ctor and never changed except that it's reset to NULL when the + // socket is shut down + wxSocketBase *m_wxsocket; + + DECLARE_NO_COPY_CLASS(wxSocketImpl) +}; + +#if defined(__WXMSW__) + #include "wx/msw/gsockmsw.h" +#else + #include "wx/unix/private/sockunix.h" +#endif + + +/* GAddress */ + +// TODO: make GAddress a real class instead of this mix of C and C++ + +// Represents a socket endpoint, i.e. -- in spite of its name -- not an address +// but an (address, port) pair +struct GAddress +{ + struct sockaddr *m_addr; + size_t m_len; + + GAddressType m_family; + int m_realfamily; + + wxSocketError m_error; +}; + +GAddress *GAddress_new(); +GAddress *GAddress_copy(GAddress *address); +void GAddress_destroy(GAddress *address); + +void GAddress_SetFamily(GAddress *address, GAddressType type); +GAddressType GAddress_GetFamily(GAddress *address); + +/* The use of any of the next functions will set the address family to + * the specific one. For example if you use GAddress_INET_SetHostName, + * address family will be implicitly set to AF_INET. + */ + +wxSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname); +wxSocketError GAddress_INET_SetBroadcastAddress(GAddress *address); +wxSocketError GAddress_INET_SetAnyAddress(GAddress *address); +wxSocketError GAddress_INET_SetHostAddress(GAddress *address, + unsigned long hostaddr); +wxSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, + const char *protocol); +wxSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port); + +wxSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, + size_t sbuf); +unsigned long GAddress_INET_GetHostAddress(GAddress *address); +unsigned short GAddress_INET_GetPort(GAddress *address); + +wxSocketError _GAddress_translate_from(GAddress *address, + struct sockaddr *addr, int len); +wxSocketError _GAddress_translate_to (GAddress *address, + struct sockaddr **addr, int *len); +wxSocketError _GAddress_Init_INET(GAddress *address); + +#if wxUSE_IPV6 + +wxSocketError GAddress_INET6_SetHostName(GAddress *address, const char *hostname); +wxSocketError GAddress_INET6_SetAnyAddress(GAddress *address); +wxSocketError GAddress_INET6_SetHostAddress(GAddress *address, + struct in6_addr hostaddr); +wxSocketError GAddress_INET6_SetPortName(GAddress *address, const char *port, + const char *protocol); +wxSocketError GAddress_INET6_SetPort(GAddress *address, unsigned short port); + +wxSocketError GAddress_INET6_GetHostName(GAddress *address, char *hostname, + size_t sbuf); +wxSocketError GAddress_INET6_GetHostAddress(GAddress *address,struct in6_addr *hostaddr); +unsigned short GAddress_INET6_GetPort(GAddress *address); + +#endif // wxUSE_IPV6 + +// these functions are available under all platforms but only implemented under +// Unix ones, elsewhere they just return wxSOCKET_INVADDR +wxSocketError _GAddress_Init_UNIX(GAddress *address); +wxSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path); +wxSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf); + +#endif /* wxUSE_SOCKETS */ +#endif /* _WX_PRIVATE_SOCKET_H_ */ diff --git a/include/wx/unix/gsockunx.h b/include/wx/unix/private/sockunix.h similarity index 99% rename from include/wx/unix/gsockunx.h rename to include/wx/unix/private/sockunix.h index 21ffe39e2b..3dc2f9d635 100644 --- a/include/wx/unix/gsockunx.h +++ b/include/wx/unix/private/sockunix.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/unix/gsockunx.h +// Name: wx/unix/private/sockunix.h // Purpose: wxSocketImpl implementation for Unix systems // Authors: Guilhem Lavaux, Vadim Zeitlin // Created: April 1997 diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index aee1b58cbf..ceccf92083 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -32,9 +32,9 @@ #endif #endif // !WX_PRECOMP -#include "wx/private/gsocket.h" #include "wx/socket.h" #include "wx/sckaddr.h" +#include "wx/private/socket.h" IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxIPaddress, wxSockAddress) diff --git a/src/common/socket.cpp b/src/common/socket.cpp index a4fb0d8f73..541749394e 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -44,7 +44,7 @@ #include "wx/evtloop.h" #include "wx/private/fd.h" -#include "wx/private/gsocket.h" +#include "wx/private/socket.h" // DLL options compatibility check: #include "wx/build.h" diff --git a/src/gtk/gsockgtk.cpp b/src/gtk/sockgtk.cpp similarity index 98% rename from src/gtk/gsockgtk.cpp rename to src/gtk/sockgtk.cpp index c847b5a2ad..bd80f85942 100644 --- a/src/gtk/gsockgtk.cpp +++ b/src/gtk/sockgtk.cpp @@ -19,7 +19,7 @@ #include #include -#include "wx/private/gsocket.h" +#include "wx/private/socket.h" #include "wx/apptrait.h" extern "C" { diff --git a/src/gtk1/gsockgtk.cpp b/src/gtk1/sockgtk.cpp similarity index 98% rename from src/gtk1/gsockgtk.cpp rename to src/gtk1/sockgtk.cpp index 8a6eab720c..b8b1ecb612 100644 --- a/src/gtk1/gsockgtk.cpp +++ b/src/gtk1/sockgtk.cpp @@ -19,7 +19,7 @@ #include #include -#include "wx/private/gsocket.h" +#include "wx/private/socket.h" #include "wx/apptrait.h" extern "C" { diff --git a/src/motif/gsockmot.cpp b/src/motif/sockmot.cpp similarity index 98% rename from src/motif/gsockmot.cpp rename to src/motif/sockmot.cpp index 468489d229..98257ddddc 100644 --- a/src/motif/gsockmot.cpp +++ b/src/motif/sockmot.cpp @@ -15,7 +15,7 @@ #include // XtAppAdd/RemoveInput() #include "wx/motif/private.h" // wxGetAppContext() -#include "wx/private/gsocket.h" +#include "wx/private/socket.h" #include "wx/apptrait.h" extern "C" { diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp index f611abaea5..0e8bbd39df 100644 --- a/src/msw/gsocket.cpp +++ b/src/msw/gsocket.cpp @@ -57,7 +57,7 @@ #if wxUSE_SOCKETS -#include "wx/private/gsocket.h" +#include "wx/private/socket.h" #include "wx/link.h" wxFORCE_LINK_MODULE(gsockmsw) diff --git a/src/msw/gsockmsw.cpp b/src/msw/gsockmsw.cpp index 69ced42119..4215428a26 100644 --- a/src/msw/gsockmsw.cpp +++ b/src/msw/gsockmsw.cpp @@ -38,7 +38,7 @@ # pragma warning(disable:4115) /* named type definition in parentheses */ #endif -#include "wx/private/gsocket.h" +#include "wx/private/socket.h" #include "wx/apptrait.h" #include "wx/link.h" diff --git a/src/os2/gsockpm.cpp b/src/os2/sockpm.cpp similarity index 98% rename from src/os2/gsockpm.cpp rename to src/os2/sockpm.cpp index ec7d114d7e..8168d7fb61 100644 --- a/src/os2/gsockpm.cpp +++ b/src/os2/sockpm.cpp @@ -12,7 +12,7 @@ #if wxUSE_SOCKETS #include -#include "wx/private/gsocket.h" +#include "wx/private/socket.h" #include "wx/app.h" #include "wx/apptrait.h" diff --git a/src/osx/core/gsockosx.cpp b/src/osx/core/sockosx.cpp similarity index 99% rename from src/osx/core/gsockosx.cpp rename to src/osx/core/sockosx.cpp index d443e4b54f..08dbd21815 100644 --- a/src/osx/core/gsockosx.cpp +++ b/src/osx/core/sockosx.cpp @@ -13,8 +13,8 @@ #if wxUSE_SOCKETS -#include "wx/private/gsocket.h" -#include "wx/unix/gsockunx.h" +#include "wx/private/socket.h" +#include "wx/unix/private/sockunix.h" #include "wx/apptrait.h" #include diff --git a/src/unix/gsocket.cpp b/src/unix/sockunix.cpp similarity index 99% rename from src/unix/gsocket.cpp rename to src/unix/sockunix.cpp index 2bdfa8d43b..0a0fbac716 100644 --- a/src/unix/gsocket.cpp +++ b/src/unix/sockunix.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/unix/gsocket.cpp +// Name: src/unix/sockunix.cpp // Purpose: wxSocketImpl implementation for Unix systems // Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia, David Elliott, // Vadim Zeitlin @@ -15,10 +15,9 @@ #if wxUSE_SOCKETS -#include "wx/private/gsocket.h" - #include "wx/private/fd.h" #include "wx/private/socket.h" +#include "wx/unix/private/sockunix.h" #include "wx/private/gsocketiohandler.h" #if defined(__VISAGECPP__) -- 2.45.2