From ae56222048a633248a50408b41a05b560125f138 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 17 Apr 2015 14:01:08 +0100
Subject: [PATCH] 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>
---
 dbus/dbus-sysdeps.h | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 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,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)