summaryrefslogtreecommitdiff
path: root/dix/extension.c
diff options
context:
space:
mode:
Diffstat (limited to 'dix/extension.c')
-rw-r--r--dix/extension.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/dix/extension.c b/dix/extension.c
index dbe6c0a97..fd1439957 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -44,9 +44,7 @@ SOFTWARE.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xproto.h>
@@ -89,7 +87,7 @@ AddExtension(const char *name, int NumEvents, int NumErrors,
return ((ExtensionEntry *) NULL);
}
- ext = calloc(sizeof(ExtensionEntry), 1);
+ ext = calloc(1, sizeof(ExtensionEntry));
if (!ext)
return NULL;
if (!dixAllocatePrivates(&ext->devPrivates, PRIVATE_EXTENSION)) {
@@ -215,7 +213,7 @@ CloseDownExtensions(void)
static Bool
ExtensionAvailable(ClientPtr client, ExtensionEntry *ext)
{
- if (XaceHook(XACE_EXT_ACCESS, client, ext) != Success)
+ if (XaceHookExtAccess(client, ext) != Success)
return FALSE;
if (!ext->base)
return FALSE;