mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-04-27 00:10:50 +02:00
dbus/dbus-sysdeps-win.c: tighter "scoping" for alternate _dbus_poll implementations (cherry picked from commit 6828a25073c16fb5af55c4aaf16a08eb90e4676d)
This commit is contained in:
parent
f128dc3cb5
commit
fb11d1f9f3
1 changed files with 6 additions and 11 deletions
|
|
@ -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
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue