diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-04-17 14:01:08 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-05-12 18:37:07 +0100 |
commit | ae56222048a633248a50408b41a05b560125f138 (patch) | |
tree | 692ae4a21277001c331d2a397e41bad8d2fde8cb | |
parent | 36e9dace74be26da1436db918b307e52a5e34c71 (diff) | |
download | dbus-ae56222048a633248a50408b41a05b560125f138.tar.gz |
DBusSocket: put the #ifdef case before the !defined case
This avoids the confusing #ifndef...#else anti-pattern.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89444
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
-rw-r--r-- | dbus/dbus-sysdeps.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index 615950b7..f6a2948e 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -125,43 +125,43 @@ typedef unsigned long dbus_gid_t; /** * Socket interface */ -#ifndef DBUS_WIN +#ifdef DBUS_WIN -typedef struct { int fd; } DBusSocket; -# define DBUS_SOCKET_FORMAT "d" -# define DBUS_SOCKET_INIT { -1 } +typedef struct { SOCKET sock; } DBusSocket; +# define DBUS_SOCKET_FORMAT "Iu" +# define DBUS_SOCKET_INIT { INVALID_SOCKET } -static inline int -_dbus_socket_printable (DBusSocket s) { return s.fd; } +static inline SOCKET +_dbus_socket_printable (DBusSocket s) { return s.sock; } static inline dbus_bool_t -_dbus_socket_is_valid (DBusSocket s) { return s.fd >= 0; } +_dbus_socket_is_valid (DBusSocket s) { return s.sock != INVALID_SOCKET; } static inline void -_dbus_socket_invalidate (DBusSocket *s) { s->fd = -1; } +_dbus_socket_invalidate (DBusSocket *s) { s->sock = INVALID_SOCKET; } static inline int -_dbus_socket_get_int (DBusSocket s) { return s.fd; } +_dbus_socket_get_int (DBusSocket s) { return (int)s.sock; } -#else /* DBUS_WIN */ +#else /* not DBUS_WIN */ -typedef struct { SOCKET sock; } DBusSocket; -# define DBUS_SOCKET_FORMAT "Iu" -# define DBUS_SOCKET_INIT { INVALID_SOCKET } +typedef struct { int fd; } DBusSocket; +# define DBUS_SOCKET_FORMAT "d" +# define DBUS_SOCKET_INIT { -1 } -static inline SOCKET -_dbus_socket_printable (DBusSocket s) { return s.sock; } +static inline int +_dbus_socket_printable (DBusSocket s) { return s.fd; } static inline dbus_bool_t -_dbus_socket_is_valid (DBusSocket s) { return s.sock != INVALID_SOCKET; } +_dbus_socket_is_valid (DBusSocket s) { return s.fd >= 0; } static inline void -_dbus_socket_invalidate (DBusSocket *s) { s->sock = INVALID_SOCKET; } +_dbus_socket_invalidate (DBusSocket *s) { s->fd = -1; } static inline int -_dbus_socket_get_int (DBusSocket s) { return (int)s.sock; } +_dbus_socket_get_int (DBusSocket s) { return s.fd; } -#endif /* DBUS_WIN */ +#endif /* not DBUS_WIN */ static inline DBusSocket _dbus_socket_get_invalid (void) |