Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
This commit is contained in:
commit
a216de9b7f
|
@ -946,10 +946,10 @@ SecurityAuditResourceIDAccess(
|
|||
* rtype is its type or class.
|
||||
* access_mode represents the intended use of the resource; see
|
||||
* resource.h.
|
||||
* rval is a pointer to the resource structure for this resource.
|
||||
* res is a pointer to the resource structure for this resource.
|
||||
*
|
||||
* Returns:
|
||||
* If access is granted, the value of rval that was passed in, else NULL.
|
||||
* If access is granted, the value of rval that was passed in, else FALSE.
|
||||
*
|
||||
* Side Effects:
|
||||
* Disallowed resource accesses are audited.
|
||||
|
|
|
@ -398,11 +398,11 @@ AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],
|
|||
AC_ARG_WITH(int10, AS_HELP_STRING([--with-int10=BACKEND], [int10 backend: vm86, x86emu or stub]),
|
||||
[INT10="$withval"],
|
||||
[INT10="$DEFAULT_INT10"])
|
||||
AC_ARG_WITH(vendor-name, AS_HELP_STRING([--with-vendor-string=VENDOR],
|
||||
AC_ARG_WITH(vendor-name, AS_HELP_STRING([--with-vendor-name=VENDOR],
|
||||
[Vendor string reported by the server]),
|
||||
[ VENDOR_STRING="$withval" ],
|
||||
[ VENDOR_STRING="$DEFAULT_VENDOR_NAME" ])
|
||||
AC_ARG_WITH(vendor-name-short, AS_HELP_STRING([--with-vendor-string-short=VENDOR],
|
||||
AC_ARG_WITH(vendor-name-short, AS_HELP_STRING([--with-vendor-name-short=VENDOR],
|
||||
[Short version of vendor string reported by the server]),
|
||||
[ VENDOR_STRING_SHORT="$withval" ],
|
||||
[ VENDOR_STRING_SHORT="$DEFAULT_VENDOR_NAME_SHORT" ])
|
||||
|
|
|
@ -903,7 +903,7 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
|
|||
* check the elements in the path
|
||||
*/
|
||||
if (PathIsAbsolute(module))
|
||||
xstrdup(module);
|
||||
found = xstrdup(module);
|
||||
path_elem = pathlist;
|
||||
while (!found && *path_elem != NULL) {
|
||||
found = FindModule(m, *path_elem, subdirlist, patterns);
|
||||
|
|
Loading…
Reference in New Issue
Block a user