[Telepathy-commits] [telepathy-salut/master] gibber_fd_transport_read: rename read to read_ as this symbol is defined in libc

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Fri Dec 12 08:03:02 PST 2008


---
 lib/gibber/gibber-fd-transport.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/gibber/gibber-fd-transport.c b/lib/gibber/gibber-fd-transport.c
index 7e5fbbc..b189c86 100644
--- a/lib/gibber/gibber-fd-transport.c
+++ b/lib/gibber/gibber-fd-transport.c
@@ -349,18 +349,18 @@ gibber_fd_transport_read (GibberFdTransport *transport,
 {
   guint8  buf[BUFSIZE + 1];
   GIOStatus status;
-  gsize read;
+  gsize read_;
 
   status = g_io_channel_read_chars (channel, (gchar *)buf, BUFSIZE,
-    &read, error);
+    &read_, error);
 
   switch (status)
     {
       case G_IO_STATUS_NORMAL:
-        buf[read] = '\0';
-        DEBUG ("Received %zd bytes", read);
+        buf[read_] = '\0';
+        DEBUG ("Received %zd bytes", read_);
         gibber_transport_received_data (GIBBER_TRANSPORT (transport),
-            buf, read);
+            buf, read_);
         return GIBBER_FD_IO_RESULT_SUCCESS;
       case G_IO_STATUS_ERROR:
         return GIBBER_FD_IO_RESULT_ERROR;
-- 
1.5.6.5




More information about the Telepathy-commits mailing list