Merge commit 'scormi3/master'

[cascardo/gnio.git] / gnio / gsocket.h

diff --git a/gnio/gsocket.h b/gnio/gsocket.h
index e1eca71..72b565f 100644 (file)
--- a/gnio/gsocket.h
+++ b/gnio/gsocket.h
@@ -27,8 +27,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include "ginetaddress.h"
-#include "gsocketaddress.h"
+#include <gnio/gsocketaddress.h>
 
 G_BEGIN_DECLS
 
@@ -91,7 +90,7 @@ void             g_socket_set_reuse_address  (GSocket  *socket,
 
 gboolean         g_socket_get_reuse_address  (GSocket  *socket);
 
-gboolean         g_socket_has_error          (GSocket  *socket,
+gboolean         g_socket_has_socket_error   (GSocket  *socket,
                                               GError  **error);
 
 gboolean         g_socket_bind               (GSocket         *socket,
@@ -114,7 +113,7 @@ gssize           g_socket_receive            (GSocket       *socket,
                                               GError       **error);
 
 gssize           g_socket_send               (GSocket       *socket,
-                                              gchar         *buffer,
+                                              const gchar   *buffer,
                                               gsize          size,
                                               GError       **error);