author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
Tue, 02 Aug 2011 13:30:29 -0700 | |
changeset 1179 | 4ad971e180c3 |
parent 253 | 88e5aa1fb5f9 |
permissions | -rw-r--r-- |
8
79cdfccc57d7
6411857 Xorg modularization: xproto-7.0.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
1 |
Need to retain FamilyInternetV6 for backwards compatibility with CDE and other |
79cdfccc57d7
6411857 Xorg modularization: xproto-7.0.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
2 |
sources written to the original X11/IPv6 draft which was included in Solaris 9. |
79cdfccc57d7
6411857 Xorg modularization: xproto-7.0.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
3 |
|
1179
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
253
diff
changeset
|
4 |
diff --git a/X.h b/X.h |
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
253
diff
changeset
|
5 |
index 5cf695d..d06886b 100644 |
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
253
diff
changeset
|
6 |
--- a/X.h |
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
253
diff
changeset
|
7 |
+++ b/X.h |
4ad971e180c3
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
253
diff
changeset
|
8 |
@@ -299,6 +299,7 @@ are reserved in the protocol for errors and replies. */ |
8
79cdfccc57d7
6411857 Xorg modularization: xproto-7.0.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
9 |
#define FamilyDECnet 1 |
79cdfccc57d7
6411857 Xorg modularization: xproto-7.0.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
10 |
#define FamilyChaos 2 |
79cdfccc57d7
6411857 Xorg modularization: xproto-7.0.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
11 |
#define FamilyInternet6 6 /* IPv6 */ |
79cdfccc57d7
6411857 Xorg modularization: xproto-7.0.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
12 |
+#define FamilyInternetV6 6 /* SUNSOFT - retained for backwards compatibility with original IPv6 draft */ |
79cdfccc57d7
6411857 Xorg modularization: xproto-7.0.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
13 |
|
79cdfccc57d7
6411857 Xorg modularization: xproto-7.0.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
14 |
/* authentication families not tied to a specific protocol */ |
79cdfccc57d7
6411857 Xorg modularization: xproto-7.0.4
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
15 |
#define FamilyServerInterpreted 5 |