# HG changeset patch
# User nenolod
# Date 1155602844 25200
# Node ID 68aec931b0b6c6b4b7d56b031db70543dcfe33cf
# Parent  dae6b30c0148b965d32df76f8ecad59d2b24e301
[svn] - gcc 4.1.1 fixes

diff -r dae6b30c0148 -r 68aec931b0b6 ChangeLog
--- a/ChangeLog	Mon Aug 14 17:13:38 2006 -0700
+++ b/ChangeLog	Mon Aug 14 17:47:24 2006 -0700
@@ -1,3 +1,12 @@
+2006-08-15 00:13:38 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2075]
+  - gcc 4.1.1 fix
+  
+
+  Changes:        Modified:
+  +1 -7           trunk/audacious/controlsocket.c  
+
+
 2006-08-13 03:00:08 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [2073]
   - better handling for file name which can't be represented correctly in current locale encoding.
diff -r dae6b30c0148 -r 68aec931b0b6 libaudacious/beepctrl.c
--- a/libaudacious/beepctrl.c	Mon Aug 14 17:13:38 2006 -0700
+++ b/libaudacious/beepctrl.c	Mon Aug 14 17:47:24 2006 -0700
@@ -49,12 +49,8 @@
 read_all(gint fd, gpointer buf, size_t count)
 {
     size_t left = count;
-    GTimer *timer;
-    gulong usec;
     gint r;
 
-    timer = g_timer_new();
-
     do {
         if ((r = read(fd, buf, left)) < 0) {
             count = -1;
@@ -62,11 +58,9 @@
         }
         left -= r;
         buf = (gchar *) buf + r;
-        g_timer_elapsed(timer, &usec);
     }
-    while (left > 0 && usec <= CTRLSOCKET_IO_TIMEOUT_USEC);
+    while (left > 0);
 
-    g_timer_destroy(timer);
     return count - left;
 }
 
@@ -74,12 +68,8 @@
 write_all(gint fd, gconstpointer buf, size_t count)
 {
     size_t left = count;
-    GTimer *timer;
-    gulong usec;
     gint written;
 
-    timer = g_timer_new();
-
     do {
         if ((written = write(fd, buf, left)) < 0) {
             count = -1;
@@ -87,11 +77,9 @@
         }
         left -= written;
         buf = (gchar *) buf + written;
-        g_timer_elapsed(timer, &usec);
     }
-    while (left > 0 && usec <= CTRLSOCKET_IO_TIMEOUT_USEC);
+    while (left > 0);
 
-    g_timer_destroy(timer);
     return count - left;
 }