fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-06 03:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

DBusSocket: put the #ifdef case before the !defined case

Browse source 
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>
This commit is contained in:
Simon McVittie 2015-04-17 14:01:08 +01:00
parent 36e9dace74
commit ae56222048
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
dbus/dbus-sysdeps.h
View file

@ -125,25 +125,7 @@ typedef unsigned long dbus_gid_t;
/**
* Socket interface
*/
#ifndef DBUS_WIN
typedef struct { int fd; } DBusSocket;
# define DBUS_SOCKET_FORMAT "d"
# define DBUS_SOCKET_INIT { -1 }
static inline int
_dbus_socket_printable (DBusSocket s) { return s.fd; }
static inline dbus_bool_t
_dbus_socket_is_valid (DBusSocket s) { return s.fd >= 0; }
static inline void
_dbus_socket_invalidate (DBusSocket *s) { s->fd = -1; }
static inline int
_dbus_socket_get_int (DBusSocket s) { return s.fd; }
#else /* DBUS_WIN */
#ifdef DBUS_WIN
typedef struct { SOCKET sock; } DBusSocket;
# define DBUS_SOCKET_FORMAT "Iu"
@ -161,7 +143,25 @@ _dbus_socket_invalidate (DBusSocket *s) { s->sock = INVALID_SOCKET; }
static inline int
_dbus_socket_get_int (DBusSocket s) { return (int)s.sock; }
#endif /* DBUS_WIN */
#else /* not DBUS_WIN */
typedef struct { int fd; } DBusSocket;
# define DBUS_SOCKET_FORMAT "d"
# define DBUS_SOCKET_INIT { -1 }
static inline int
_dbus_socket_printable (DBusSocket s) { return s.fd; }
static inline dbus_bool_t
_dbus_socket_is_valid (DBusSocket s) { return s.fd >= 0; }
static inline void
_dbus_socket_invalidate (DBusSocket *s) { s->fd = -1; }
static inline int
_dbus_socket_get_int (DBusSocket s) { return s.fd; }
#endif /* not DBUS_WIN */
static inline DBusSocket
_dbus_socket_get_invalid (void)