diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-12-22 09:29:59 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-12-22 09:29:59 +1000 |
| commit | e395efc25f9fd60377f32c2bf1a9153d70908236 (patch) | |
| tree | 8f8a4fdd19f7ab2aba423f1279b29c336a3060eb /include | |
| parent | 2bb282cd45cb8149b39d72397ef5bbcfebca11d2 (diff) | |
| parent | fcda98c48610fd507ca0b89c6006a5497d9dc1c9 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into multitouch
Conflicts:
configure.ac
dix/inpututils.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/dix.h | 4 | ||||
| -rw-r--r-- | include/os.h | 6 | ||||
| -rw-r--r-- | include/registry.h | 2 | ||||
| -rw-r--r-- | include/resource.h | 2 | ||||
| -rw-r--r-- | include/xorg-config.h.in | 6 |
5 files changed, 13 insertions, 7 deletions
diff --git a/include/dix.h b/include/dix.h index 4f21b4105..f3f68d39c 100644 --- a/include/dix.h +++ b/include/dix.h @@ -175,9 +175,9 @@ extern _X_HIDDEN Bool CreateConnectionBlock(void); /* dixutils.c */ extern _X_EXPORT int CompareISOLatin1Lowered( - unsigned char * /*a*/, + const unsigned char * /*a*/, int alen, - unsigned char * /*b*/, + const unsigned char * /*b*/, int blen); extern _X_EXPORT int dixLookupWindow( diff --git a/include/os.h b/include/os.h index 1fd5367c4..48ce32962 100644 --- a/include/os.h +++ b/include/os.h @@ -127,7 +127,7 @@ extern _X_EXPORT void CloseWellKnownConnections(void); extern _X_EXPORT XID AuthorizationIDOfClient(ClientPtr /*client*/); -extern _X_EXPORT char *ClientAuthorized( +extern _X_EXPORT const char *ClientAuthorized( ClientPtr /*client*/, unsigned int /*proto_n*/, char* /*auth_proto*/, @@ -405,7 +405,7 @@ extern _X_EXPORT void InitAuthorization(char * /*filename*/); extern _X_EXPORT int AuthorizationFromID ( XID id, unsigned short *name_lenp, - char **namep, + const char **namep, unsigned short *data_lenp, char **datap); @@ -415,7 +415,7 @@ extern _X_EXPORT XID CheckAuthorization( unsigned int /*datalength*/, const char * /*data*/, ClientPtr /*client*/, - char ** /*reason*/ + const char ** /*reason*/ ); extern _X_EXPORT void ResetAuthorization(void); diff --git a/include/registry.h b/include/registry.h index 325f76515..44f79259e 100644 --- a/include/registry.h +++ b/include/registry.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Registration functions. The name string is not copied, so it must * not be a stack variable. */ -extern _X_EXPORT void RegisterResourceName(RESTYPE type, char *name); +extern _X_EXPORT void RegisterResourceName(RESTYPE type, const char *name); extern _X_EXPORT void RegisterExtensionNames(ExtensionEntry *ext); /* diff --git a/include/resource.h b/include/resource.h index 772b7b877..5da281913 100644 --- a/include/resource.h +++ b/include/resource.h @@ -157,7 +157,7 @@ typedef Bool (*FindComplexResType)( pointer /*cdata*/); extern _X_EXPORT RESTYPE CreateNewResourceType( - DeleteType /*deleteFunc*/, char * /*name*/); + DeleteType /*deleteFunc*/, const char * /*name*/); extern _X_EXPORT void SetResourceTypeErrorValue( RESTYPE /*type*/, int /*errorValue*/); diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in index 6b9230f3c..2cc416ae7 100644 --- a/include/xorg-config.h.in +++ b/include/xorg-config.h.in @@ -130,4 +130,10 @@ /* Use libpciaccess */ #undef XSERVER_LIBPCIACCESS +/* Have setugid */ +#undef HAVE_ISSETUGID + +/* Have getresuid */ +#undef HAVE_GETRESUID + #endif /* _XORG_CONFIG_H_ */ |