Merge remote-tracking branch 'origin/master' into obsdobsd

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lx_output.c b/src/lx_output.c
index 40455ce..fbe21ab 100644
--- a/src/lx_output.c
+++ b/src/lx_output.c
@@ -47,7 +47,7 @@ static void
 lx_create_resources(xf86OutputPtr output)
 {
     int ret;
-    char *s;
+    const char *s;
     ScrnInfoPtr pScrni = output->scrn;
     GeodeRec *pGeode = GEODEPTR(pScrni);
 
@@ -285,7 +285,7 @@ LXSetupOutput(ScrnInfoPtr pScrni)
 
     output = xf86OutputCreate(pScrni, &lx_output_funcs, "default");
 
-    lxpriv = xnfcalloc(1, sizeof(LXOutputPrivateRec));
+    lxpriv = XNFcallocarray(1, sizeof(LXOutputPrivateRec));
 
     if (!lxpriv) {
         xf86OutputDestroy(output);