[Antiright-devel] antiright configure gtkshell/update_manager.c

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/11/25 01:55:07

Modified files:
        .              : configure 
        gtkshell       : update_manager.c 

Log message:
        Resolve merge conflicts.  Fix to compile with gcc 2.95.3.    

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/update_manager.c?cvsroot=antiright&r1=1.9&r2=1.10

Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- configure   6 Sep 2007 14:38:08 -0000       1.108
+++ configure   25 Nov 2007 01:55:07 -0000      1.109
@@ -24,7 +24,7 @@
 #
 ###############################################################################
 
-VERSION=3.6
+VERSION=3.7
 
 USE_DISTCC=NO
 USE_CCACHE=NO
@@ -134,7 +134,7 @@
 
 INCLUDE="$INCLUDE -I/usr/pkg/include -I/usr/local/include -I/usr/X11R6/include"
 LIBDIR="$LIBDIR -L/usr/pkg/lib -L/usr/local/lib -L/usr/X11R6/lib"
-ARDATADIR=$PREFIX/share/antiright
+LDFLAGS="$LDFLAGS -lX11 -lXext -lXinerama"
 DEFS="$DEFS -D_GNU_SOURCE -DARDATADIR='\"$PREFIX/share/antiright\"'"
 
 INSTALL=/usr/bin/install

Index: gtkshell/update_manager.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/update_manager.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gtkshell/update_manager.c   11 Jun 2007 21:32:45 -0000      1.9
+++ gtkshell/update_manager.c   25 Nov 2007 01:55:07 -0000      1.10
@@ -25,6 +25,8 @@
 static void
 gsh_update_each(gpointer data, gpointer user_data)
 {
+       struct GSHUpdatedWidget *item;
+
        UNUSED(user_data);
        /*
         * Ensure that the argument containing the structure is not
@@ -34,7 +36,6 @@
        ARWIFNP(data)
        {
 #endif /* DEBUG */
-               struct GSHUpdatedWidget *item;
 
                /*
                 * Assign data to structure and call function pointer