diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-16 20:49:54 +0100 |
|---|---|---|
| committer | Marc Haesen <marc@hc-consult.be> | 2011-12-16 20:46:08 +0100 |
| commit | 1ae4005bfe3690b34ec40e33918b3e24468d47e1 (patch) | |
| tree | 451bee4796d3058f90af4e66f2cfbdfbe6c77bfe /xorg-server/os/xdmcp.c | |
| parent | 64718ba8bdcecd8d736a48239847b1f9aadd40ea (diff) | |
| parent | 47913e82955ec8e2b1ba4d4b145497dede9163b5 (diff) | |
| download | vcxsrv-1ae4005bfe3690b34ec40e33918b3e24468d47e1.tar.gz vcxsrv-1ae4005bfe3690b34ec40e33918b3e24468d47e1.tar.bz2 vcxsrv-1ae4005bfe3690b34ec40e33918b3e24468d47e1.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/registry.c
xorg-server/include/resource.h
xorg-server/os/access.c
xorg-server/os/auth.c
Diffstat (limited to 'xorg-server/os/xdmcp.c')
| -rw-r--r-- | xorg-server/os/xdmcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/os/xdmcp.c b/xorg-server/os/xdmcp.c index 9e79ea702..37b51f6b2 100644 --- a/xorg-server/os/xdmcp.c +++ b/xorg-server/os/xdmcp.c @@ -60,7 +60,7 @@ #define X_INCLUDE_NETDB_H #include <X11/Xos_r.h> -static char *defaultDisplayClass = COMPILEDDISPLAYCLASS; +static const char *defaultDisplayClass = COMPILEDDISPLAYCLASS; extern void match_interface(u_long u_lQuery); @@ -486,7 +486,7 @@ XdmcpRegisterConnection ( if (SOCKADDR_FAMILY(FromAddress) == AF_INET6) { fromAddr = &((struct sockaddr_in6 *)&FromAddress)->sin6_addr; } else if ((SOCKADDR_FAMILY(FromAddress) == AF_INET) && - IN6_IS_ADDR_V4MAPPED((struct in6_addr *) address)) { + IN6_IS_ADDR_V4MAPPED((const struct in6_addr *) address)) { fromAddr = &((struct sockaddr_in *)&FromAddress)->sin_addr; regAddr = &((struct sockaddr_in6 *)&address)->sin6_addr.s6_addr[12]; regAddrlen = sizeof(struct in_addr); @@ -1689,7 +1689,7 @@ get_fromaddr_by_name( static int get_mcast_options(int argc, char **argv, int i) { - char *address = XDM_DEFAULT_MCAST_ADDR6; + const char *address = XDM_DEFAULT_MCAST_ADDR6; int hopcount = 1; struct addrinfo hints; char portstr[6]; |