Module Name:    xsrc
Committed By:   christos
Date:           Wed Sep 21 22:11:16 UTC 2016

Modified Files:
        xsrc/external/mit/xfs/dist/os: xfstrans.c
        xsrc/external/mit/xorg-server.old/include: dix-config.h xorg-server.h
        xsrc/external/mit/xorg-server/include: dix-config.h xorg-server.h

Log Message:
PR/51494: Rin Okuyama: Fix MKINET6=no build.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xfs/dist/os/xfstrans.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
    xsrc/external/mit/xorg-server.old/include/dix-config.h \
    xsrc/external/mit/xorg-server.old/include/xorg-server.h
cvs rdiff -u -r1.23 -r1.24 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.13 -r1.14 \
    xsrc/external/mit/xorg-server/include/xorg-server.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xfs/dist/os/xfstrans.c
diff -u xsrc/external/mit/xfs/dist/os/xfstrans.c:1.1.1.4 xsrc/external/mit/xfs/dist/os/xfstrans.c:1.2
--- xsrc/external/mit/xfs/dist/os/xfstrans.c:1.1.1.4	Wed Feb 25 15:02:39 2015
+++ xsrc/external/mit/xfs/dist/os/xfstrans.c	Wed Sep 21 18:11:16 2016
@@ -45,7 +45,7 @@ TRANS(GetInetdListenInfo) (int fd)
 
     /* Fill in correct address/portnum */
     TRANS(SocketINETGetAddr)(inetdCI);
-#ifdef AF_INET6
+#if defined(IPv6) && defined(AF_INET6)
     if ( ((struct sockaddr *)(inetdCI->addr))->sa_family == AF_INET6 )
 	portnum = ntohs(((struct sockaddr_in6 *)(inetdCI->addr))->sin6_port);
     else

Index: xsrc/external/mit/xorg-server.old/include/dix-config.h
diff -u xsrc/external/mit/xorg-server.old/include/dix-config.h:1.1.1.1 xsrc/external/mit/xorg-server.old/include/dix-config.h:1.2
--- xsrc/external/mit/xorg-server.old/include/dix-config.h:1.1.1.1	Thu Jun  9 05:08:01 2016
+++ xsrc/external/mit/xorg-server.old/include/dix-config.h	Wed Sep 21 18:11:16 2016
@@ -248,7 +248,9 @@
 #define HAVE_VASPRINTF 1
 
 /* Support IPv6 for TCP connections */
-#define IPv6 1
+#ifndef __NetBSD__	/* Defined by the build */
+# define IPv6 1
+#endif
 
 /* Support os-specific local connections */
 /* #undef LOCALCONN */
Index: xsrc/external/mit/xorg-server.old/include/xorg-server.h
diff -u xsrc/external/mit/xorg-server.old/include/xorg-server.h:1.1.1.1 xsrc/external/mit/xorg-server.old/include/xorg-server.h:1.2
--- xsrc/external/mit/xorg-server.old/include/xorg-server.h:1.1.1.1	Thu Jun  9 05:08:01 2016
+++ xsrc/external/mit/xorg-server.old/include/xorg-server.h	Wed Sep 21 18:11:16 2016
@@ -39,7 +39,9 @@
 #define HAS_SHM 1
 
 /* Support IPv6 for TCP connections */
-#define IPv6 1
+#ifndef __NetBSD__	/* Defined by the build */
+# define IPv6 1
+#endif
 
 /* Support MIT-SHM Extension */
 #define MITSHM 1

Index: xsrc/external/mit/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.23 xsrc/external/mit/xorg-server/include/dix-config.h:1.24
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.23	Tue Aug 30 04:35:24 2016
+++ xsrc/external/mit/xorg-server/include/dix-config.h	Wed Sep 21 18:11:16 2016
@@ -251,7 +251,9 @@
 #define HAVE_VASPRINTF 1
 
 /* Support IPv6 for TCP connections */
-#define IPv6 1
+#ifndef __NetBSD__	/* Defined by the build */
+# define IPv6 1
+#endif
 
 /* Support os-specific local connections */
 /* #undef LOCALCONN */

Index: xsrc/external/mit/xorg-server/include/xorg-server.h
diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.13 xsrc/external/mit/xorg-server/include/xorg-server.h:1.14
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.13	Tue Aug 30 04:35:24 2016
+++ xsrc/external/mit/xorg-server/include/xorg-server.h	Wed Sep 21 18:11:16 2016
@@ -70,7 +70,9 @@
 #define HAVE_STRNDUP 1
 
 /* Support IPv6 for TCP connections */
-#define IPv6 1
+#ifndef __NetBSD__	/* Defined by the build */
+# define IPv6 1
+#endif
 
 /* Support MIT-SHM Extension */
 #define MITSHM 1

Reply via email to