xf86-video-nested: 3 commits - configure.ac src/Makefile.am src/nested_input.c src/xlibclient.c

[GitLab Mirror]

 configure.ac       |    5 ++---
 src/Makefile.am    |    3 ++-
 src/nested_input.c |    6 ++----
 src/xlibclient.c   |    3 ++-
 4 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit ebf3e47c68089d7af6fb6971bdd33185ba83678c
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jan 8 13:54:12 2024 -0800

    Quiet 3 -Wdeclaration-after-statement warnings
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/src/nested_input.c b/src/nested_input.c
index 9d2e0d3..b674c35 100644
--- a/src/nested_input.c
+++ b/src/nested_input.c
@@ -194,8 +194,7 @@ _nested_input_init_buttons(DeviceIntPtr device) {
 
     map = calloc(NUM_MOUSE_BUTTONS, sizeof(CARD8));
 
-    int i;
-    for (i = 0; i < NUM_MOUSE_BUTTONS; i++)
+    for (int i = 0; i < NUM_MOUSE_BUTTONS; i++)
         map[i] = i;
 
     if (!InitButtonClassDeviceStruct(device, NUM_MOUSE_BUTTONS, buttonLabels, map)) {
@@ -218,8 +217,7 @@ _nested_input_init_axes(DeviceIntPtr device) {
         return BadAlloc;
     }
 
-    int i;
-    for (i = 0; i < NUM_MOUSE_AXES; i++) {
+    for (int i = 0; i < NUM_MOUSE_AXES; i++) {
         xf86InitValuatorAxisStruct(device, i, (Atom)0, -1, -1, 1, 1, 1, Absolute);
         xf86InitValuatorDefaults(device, i);
     }
diff --git a/src/xlibclient.c b/src/xlibclient.c
index 10ab970..7d5a66d 100644
--- a/src/xlibclient.c
+++ b/src/xlibclient.c
@@ -254,8 +254,9 @@ xf86DrvMsg(scrnIndex, X_INFO, "blu_mask: 0x%lx\n", pPriv->img->blue_mask);
     *retGreenMask = pPriv->img->green_mask;
     *retBlueMask = pPriv->img->blue_mask;
 
-    XEvent ev;
     while (1) {
+        XEvent ev;
+
         XNextEvent(pPriv->display, &ev);
         if (ev.type == Expose) {
             break;
commit c13fd78b539407b4c7c6bb7a47fc470866fe48a1
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jan 8 13:50:46 2024 -0800

    Add X.Org's standard C warning flags to AM_CFLAGS
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 44dc656..2c051f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,8 @@
 # Author: Paulo Zanoni <pzanoni at mandriva.com>
 #
 
-AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS) $(X11_CFLAGS) $(XEXT_CFLAGS)
+AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS) $(PCIACCESS_CFLAGS) \
+        $(X11_CFLAGS) $(XEXT_CFLAGS)
 
 nested_drv_la_LTLIBRARIES = nested_drv.la
 nested_drv_la_LDFLAGS = -module -avoid-version
commit 9734a4dff061acdf3338fa40120db671ad883e23
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jan 8 13:48:44 2024 -0800

    configure: Use LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOL
    
    AC_PROG_LIBTOOL was replaced by LT_INIT in libtool 2 in 2008,
    so it's time to rely on it.
    
    Clears autoconf warnings:
    
    configure.ac:44: warning: The macro 'AC_PROG_LIBTOOL' is obsolete.
    configure.ac:44: You should run autoupdate.
    aclocal.m4:3465: AC_PROG_LIBTOOL is expanded from...
    configure.ac:44: the top level
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/configure.ac b/configure.ac
index a34e7c3..50b38af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xf86-video-nestedy],
+AC_INIT([xf86-video-nested],
         [0.1.0],
         [https://gitlab.freedesktop.org/xorg/driver/xf86-video-nested/issues],
         [xf86-video-nested])
@@ -40,8 +40,7 @@ XORG_MACROS_VERSION(1.3)
 XORG_DEFAULT_OPTIONS
 
 # Initialize libtool
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
+LT_INIT([disable-static])
 
 # Define a configure option for an alternate module directory
 AC_ARG_WITH(xorg-module-dir, [  --with-xorg-module-dir=DIR ],