summaryrefslogtreecommitdiff
path: root/glib
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-03-25 13:52:45 -0400
committerDan Winship <danw@gnome.org>2014-03-30 11:55:47 -0400
commit3da5d59078b135ee224dae223b7ebb3e873e980a (patch)
tree332def9069f140367b74469a2ad74733093a0c06 /glib
parentbefc111c435be63bdc6a2d59204f697d26688369 (diff)
gio: move Winsock error mapping to g_io_error_from_win32_error()
Rather than having special code in gsocket.c, handle Winsock errors along with other Win32 errors in gioerror.c Also, reference g_win32_error_message() from the g_io_error_from_win32_error() docs, and update the g_win32_error_message() docs to clarify that it works with Winsock error codes too.
Diffstat (limited to 'glib')
-rw-r--r--glib/gwin32.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/glib/gwin32.c b/glib/gwin32.c
index ea26bf410..3c60df4c9 100644
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -161,12 +161,12 @@ g_win32_getlocale (void)
* g_win32_error_message:
* @error: error code.
*
- * Translate a Win32 error code (as returned by GetLastError()) into
- * the corresponding message. The message is either language neutral,
- * or in the thread's language, or the user's language, the system's
- * language, or US English (see docs for FormatMessage()). The
- * returned string is in UTF-8. It should be deallocated with
- * g_free().
+ * Translate a Win32 error code (as returned by GetLastError() or
+ * WSAGetLastError()) into the corresponding message. The message is
+ * either language neutral, or in the thread's language, or the user's
+ * language, the system's language, or US English (see docs for
+ * FormatMessage()). The returned string is in UTF-8. It should be
+ * deallocated with g_free().
*
* Returns: newly-allocated error message
**/