[patch xdm 4/4] Unifdef X_NO_SYS_UN
Matthieu Herrb
matthieu at herrb.eu
Wed Dec 2 03:22:24 PST 2015
Nothing has set that since the modularization
Signed-off-by: Matthieu Herrb <matthieu at herrb.eu>
---
xdm/choose.c | 5 +----
xdm/netaddr.c | 4 +---
xdm/prngc.c | 4 +---
xdm/socket.c | 4 +---
xdm/xdmcp.c | 4 +---
5 files changed, 5 insertions(+), 16 deletions(-)
diff --git xdm/choose.c xdm/choose.c
index 2d9aabd..f7472f5 100644
--- xdm/choose.c
+++ xdm/choose.c
@@ -42,10 +42,7 @@ in this Software without prior written authorization from The Open Group.
# include "dm_socket.h"
# include <arpa/inet.h>
-
-# ifndef X_NO_SYS_UN
-# include <sys/un.h>
-# endif
+# include <sys/un.h>
# include <ctype.h>
# include <errno.h>
diff --git xdm/netaddr.c xdm/netaddr.c
index 841d479..ba23148 100644
--- xdm/netaddr.c
+++ xdm/netaddr.c
@@ -46,9 +46,7 @@ from The Open Group.
# endif
# ifdef UNIXCONN
-# ifndef X_NO_SYS_UN
-# include <sys/un.h> /* struct sockaddr_un */
-# endif
+# include <sys/un.h> /* struct sockaddr_un */
# endif
/* given an XdmcpNetaddr, returns the socket protocol family used,
diff --git xdm/prngc.c xdm/prngc.c
index c1a89bc..dcc0863 100644
--- xdm/prngc.c
+++ xdm/prngc.c
@@ -26,9 +26,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <X11/Xos.h>
-#ifndef X_NO_SYS_UN
-# include <sys/un.h>
-#endif
+#include <sys/un.h>
#include <netinet/in.h>
#include <errno.h>
#include <signal.h>
diff --git xdm/socket.c xdm/socket.c
index b658238..251697e 100644
--- xdm/socket.c
+++ xdm/socket.c
@@ -63,9 +63,7 @@ from the copyright holder.
# include <errno.h>
# include "dm_socket.h"
-# ifndef X_NO_SYS_UN
-# include <sys/un.h>
-# endif
+# include <sys/un.h>
# include <netdb.h>
# include <arpa/inet.h>
diff --git xdm/xdmcp.c xdm/xdmcp.c
index b56e588..9f2bc41 100644
--- xdm/xdmcp.c
+++ xdm/xdmcp.c
@@ -46,9 +46,7 @@ from The Open Group.
# include "dm_socket.h"
-# ifndef X_NO_SYS_UN
-# include <sys/un.h>
-# endif
+# include <sys/un.h>
# include <netdb.h>
# include <arpa/inet.h>
--
1.9.1
More information about the xorg-devel
mailing list