svn merge -r577:HEAD ^/branches/released .

1 files changed, 12 insertions, 11 deletions

diff --git a/xorg-server/os/osdep.h b/xorg-server/os/osdep.h
index fda1edf72..32b4a6763 100644
--- a/xorg-server/os/osdep.h
+++ b/xorg-server/os/osdep.h
@@ -114,7 +114,8 @@ SOFTWARE.
 #if defined(XDMCP) || defined(HASXDMAUTH)

 typedef Bool (*ValidatorFunc)(ARRAY8Ptr Auth, ARRAY8Ptr Data, int packet_type);

 typedef Bool (*GeneratorFunc)(ARRAY8Ptr Auth, ARRAY8Ptr Data, int packet_type);

-typedef Bool (*AddAuthorFunc)(unsigned name_length, char *name, unsigned data_length, char *data);

+typedef Bool (*AddAuthorFunc)(unsigned name_length, const char *name,

+			      unsigned data_length, char *data);

 #endif

 

 typedef struct _connectionInput {

@@ -138,19 +139,19 @@ struct _osComm;
 #define AuthInitArgs void

 typedef void (*AuthInitFunc) (AuthInitArgs);

 

-#define AuthAddCArgs unsigned short data_length, char *data, XID id

+#define AuthAddCArgs unsigned short data_length, const char *data, XID id

 typedef int (*AuthAddCFunc) (AuthAddCArgs);

 

-#define AuthCheckArgs unsigned short data_length, char *data, ClientPtr client, char **reason

+#define AuthCheckArgs unsigned short data_length, const char *data, ClientPtr client, char **reason

 typedef XID (*AuthCheckFunc) (AuthCheckArgs);

 

 #define AuthFromIDArgs XID id, unsigned short *data_lenp, char **datap

 typedef int (*AuthFromIDFunc) (AuthFromIDArgs);

 

-#define AuthGenCArgs unsigned data_length, char *data, XID id, unsigned *data_length_return, char **data_return

+#define AuthGenCArgs unsigned data_length, const char *data, XID id, unsigned *data_length_return, char **data_return

 typedef XID (*AuthGenCFunc) (AuthGenCArgs);

 

-#define AuthRemCArgs unsigned short data_length, char *data

+#define AuthRemCArgs unsigned short data_length, const char *data

 typedef int (*AuthRemCFunc) (AuthRemCArgs);

 

 #define AuthRstCArgs void

@@ -254,29 +255,29 @@ extern void XdmcpUseMsg (void);
 extern int XdmcpOptions(int argc, char **argv, int i);

 extern void XdmcpRegisterConnection (

     int	    type,

-    char    *address,

+    const char    *address,

     int	    addrlen);

 extern void XdmcpRegisterAuthorizations (void);

-extern void XdmcpRegisterAuthorization (char *name, int namelen);

+extern void XdmcpRegisterAuthorization (const char *name, int namelen);

 extern void XdmcpInit (void);

 extern void XdmcpReset (void);

 extern void XdmcpOpenDisplay(int sock);

 extern void XdmcpCloseDisplay(int sock);

 extern void XdmcpRegisterAuthentication (

-    char    *name,

+    const char    *name,

     int	    namelen,

-    char    *data,

+    const char    *data,

     int	    datalen,

     ValidatorFunc Validator,

     GeneratorFunc Generator,

     AddAuthorFunc AddAuth);

 

 struct sockaddr_in;

-extern void XdmcpRegisterBroadcastAddress (struct sockaddr_in *addr);

+extern void XdmcpRegisterBroadcastAddress (const struct sockaddr_in *addr);

 #endif

 

 #ifdef HASXDMAUTH

-extern void XdmAuthenticationInit (char *cookie, int cookie_length);

+extern void XdmAuthenticationInit (const char *cookie, int cookie_length);

 #endif

 

 #endif /* _OSDEP_H_ */