Emil Velikov <emil.l.veli...@gmail.com> writes: > Hi Keith, > > Please consider pulling into master. > > Thanks. > > The following changes since commit 81a4952d3dcab9ca3a1ee399c773f5ac352036c4: > > Merge remote-tracking branch 'whot/for-keith' (2014-03-11 22:04:36 -0700) > > are available in the git repository at: > > > https://github.com/evelikov/xserver.git extension_loader_cleanup > > for you to fetch changes up to f95f72838ba07b3f83e9fb320d6db85c79174f3c: > > miinitext: introduce LoadExtensionList() to replace over LoadExtension() > (2014-03-14 14:03:32 +0000)
Looks like you caught every use except within ephyr. Can you squash this
patch into your first patch so that we don't have a broken build in the
middle of the patch series?
From 160b8992dedf80e75508ebbba526f672fdb9833d Mon Sep 17 00:00:00 2001
From: Keith Packard <kei...@keithp.com>
Date: Sat, 22 Mar 2014 14:00:07 -0700
Subject: [PATCH] ephyr: Fixup for LoadExtension -> LoadExtensionList
transition
LoadExtension has been replaced by LoadExtensionList; this additional
patch fixes up ephyr to follow the API change.
Signed-off-by: Keith Packard <kei...@keithp.com>
---
hw/kdrive/ephyr/ephyrinit.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index 807e717..fac84cd 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -65,10 +65,7 @@ static const ExtensionModule ephyrExtensions[] = {
static
void ephyrExtensionInit(void)
{
- int i;
-
- for (i = 0; i < ARRAY_SIZE(ephyrExtensions); i++)
- LoadExtension(&ephyrExtensions[i], TRUE);
+ LoadExtensionList(ephyrExtensions, ARRAY_SIZE(ephyrExtensions), TRUE);
}
--
1.9.0
--
keith.pack...@intel.com
pgpwKkfPEpbSw.pgp
Description: PGP signature
_______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
