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/osdep.h | |
| 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/osdep.h')
| -rw-r--r-- | xorg-server/os/osdep.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/os/osdep.h b/xorg-server/os/osdep.h index 72bd7d762..71a7e44e3 100644 --- a/xorg-server/os/osdep.h +++ b/xorg-server/os/osdep.h @@ -137,7 +137,7 @@ typedef void (*AuthInitFunc) (AuthInitArgs); #define AuthAddCArgs unsigned short data_length, const char *data, XID id typedef int (*AuthAddCFunc) (AuthAddCArgs); -#define AuthCheckArgs unsigned short data_length, const char *data, ClientPtr client, char **reason +#define AuthCheckArgs unsigned short data_length, const char *data, ClientPtr client, const char **reason typedef XID (*AuthCheckFunc) (AuthCheckArgs); #define AuthFromIDArgs XID id, unsigned short *data_lenp, char **datap |