From fb11d1f9f30ce83846246b9aa455f7a1b1fb28d9 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 22 Apr 2009 15:28:58 +0200
Subject: [PATCH] dbus/dbus-sysdeps-win.c: tighter "scoping" for alternate
 _dbus_poll implementations (cherry picked from commit
 6828a25073c16fb5af55c4aaf16a08eb90e4676d)

---
 dbus/dbus-sysdeps-win.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 60e2552..bca2f1c 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -1015,13 +1015,15 @@ out0:
  * @param timeout_milliseconds timeout or -1 for infinite
  * @returns numbers of fds with revents, or <0 on error
  */
-#define USE_CHRIS_IMPL 0
-#if USE_CHRIS_IMPL
 int
 _dbus_poll (DBusPollFD *fds,
             int         n_fds,
             int         timeout_milliseconds)
 {
+#define USE_CHRIS_IMPL 0
+
+#if USE_CHRIS_IMPL
+
 #define DBUS_POLL_CHAR_BUFFER_SIZE 2000
   char msg[DBUS_POLL_CHAR_BUFFER_SIZE];
   char *msgp;
@@ -1160,15 +1162,9 @@ _dbus_poll (DBusPollFD *fds,
     free(pEvents);
 
   return ret;
-}
 
-#else   // USE_CHRIS_IMPL
+#else   /* USE_CHRIS_IMPL */
 
-int
-_dbus_poll (DBusPollFD *fds,
-            int         n_fds,
-            int         timeout_milliseconds)
-{
 #define DBUS_POLL_CHAR_BUFFER_SIZE 2000
   char msg[DBUS_POLL_CHAR_BUFFER_SIZE];
   char *msgp;
@@ -1283,10 +1279,9 @@ _dbus_poll (DBusPollFD *fds,
           }
       }
   return ready;
+#endif  /* USE_CHRIS_IMPL */
 }
 
-#endif  // USE_CHRIS_IMPL
-
 
 
 
-- 
2.7.4