From 80cb6bca9f771ef15c00cc41af2b9f315d66258d Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 27 May 2010 06:18:40 +0000 Subject: xserver git update 27/5/2010 --- xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c') diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c index 60f200629..da573dacb 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c @@ -262,7 +262,7 @@ ephyrHostXVQueryAdaptors (EphyrHostXVAdaptorArray **a_adaptors) EPHYR_LOG ("enter\n") ; - result = Xcalloc (1, sizeof (EphyrHostXVAdaptorArray)) ; + result = calloc (1, sizeof (EphyrHostXVAdaptorArray)) ; if (!result) goto out ; @@ -340,7 +340,7 @@ ephyrHostXVAdaptorGetVideoFormats (const EphyrHostXVAdaptor *a_this, EPHYR_RETURN_VAL_IF_FAIL (a_this, NULL) ; nb_formats = ((XvAdaptorInfo*)a_this)->num_formats ; - formats = Xcalloc (nb_formats, sizeof (EphyrHostVideoFormat)) ; + formats = calloc (nb_formats, sizeof (EphyrHostVideoFormat)) ; for (i=0; i < nb_formats; i++) { memset (&visual_info_template, 0, sizeof (visual_info_template)) ; visual_info_template.visualid = @@ -454,7 +454,7 @@ ephyrHostXVQueryEncodings (int a_port_id, &num_encodings, &encoding_info) ; if (num_encodings && encoding_info) { - encodings = Xcalloc (num_encodings, sizeof (EphyrHostEncoding)) ; + encodings = calloc (num_encodings, sizeof (EphyrHostEncoding)) ; for (i=0; i