xserver: Branch 'master'

[Adam Jackson]

 os/io.c |   27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

New commits:
commit 0b695262176e96f508921905ee7f9cc086c7daf0
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Oct 23 15:01:58 2008 -0400

    Change some #define foo() -> static void foo()

diff --git a/os/io.c b/os/io.c
index 40f69cf..e25a79c 100644
--- a/os/io.c
+++ b/os/io.c
@@ -171,14 +171,25 @@ static OsCommPtr AvailableInput = (OsCommPtr)NULL;
  *    a partial request) because others clients need to be scheduled.
  *****************************************************************/
 
-#define YieldControl()				\
-        { isItTimeToYield = TRUE;		\
-	  timesThisConnection = 0; }
-#define YieldControlNoInput()			\
-        { YieldControl();			\
-	  FD_CLR(fd, &ClientsWithInput); }
-#define YieldControlDeath()			\
-        { timesThisConnection = 0; }
+static void
+YieldControl(void)
+{
+    isItTimeToYield = TRUE;
+    timesThisConnection = 0;
+}
+
+static void
+YieldControlNoInput(void)
+{
+    YieldControl();
+    FD_CLR(fd, &ClientsWithInput);
+}
+
+static void
+YieldControlDeath(void)
+{
+    timesThisConnection = 0;
+}
 
 int
 ReadRequestFromClient(ClientPtr client)