On Friday, 3 August 2007 01:16, Alon Bar-Lev wrote: > > config.* conflicts with autoconf files. > Rename the to configparser.*. > > After applying this patch, you should rename: > config.h->configparser.h > config.c->configparser.c
OK > I did not want to include the removal/addition in patch. Please do, it's easier to apply complete patches. Greetings, Rafael > --- > > diff -urNp suspend.org/resume.c suspend-0.6_beta1/resume.c > --- suspend.org/resume.c 2007-05-13 20:53:13.000000000 +0300 > +++ suspend-0.6_beta1/resume.c 2007-08-01 23:05:59.000000000 +0300 > @@ -34,3 +34,3 @@ > #include "swsusp.h" > -#include "config.h" > +#include "configparser.h" > #include "md5.h" > diff -urNp suspend.org/s2ram.c suspend-0.6_beta1/s2ram.c > --- suspend.org/s2ram.c 2007-06-17 23:51:30.000000000 +0300 > +++ suspend-0.6_beta1/s2ram.c 2007-08-02 17:36:49.000000000 +0300 > @@ -16,7 +17,7 @@ > #endif > #include "vt.h" > #include "s2ram.h" > -#include "config.h" > +#include "configparser.h" > > > /* Actually enter the suspend. May be ran on frozen system. */ > diff -urNp suspend.org/s2ram-x86.c suspend-0.6_beta1/s2ram-x86.c > --- suspend.org/s2ram-x86.c 2007-08-03 00:33:20.000000000 +0300 > +++ suspend-0.6_beta1/s2ram-x86.c 2007-08-02 23:50:33.000000000 +0300 > @@ -16,7 +17,7 @@ > #include "vbetool/vbetool.h" > #include "vt.h" > #include "s2ram.h" > -#include "config.h" > +#include "configparser.h" > > /* From dmidecode.c */ > void dmi_scan(void); > diff -urNp suspend.org/suspend.c suspend-0.6_beta1/suspend.c > --- suspend.org/suspend.c 2007-07-29 21:30:27.000000000 +0300 > +++ suspend-0.6_beta1/suspend.c 2007-08-02 23:55:20.000000000 +0300 > @@ -42,4 +41,4 @@ > #include "swsusp.h" > -#include "config.h" > +#include "configparser.h" > #include "md5.h" > #include "splash.h" > --- suspend.org/config.c 2007-05-13 20:53:13.000000000 +0300 > +++ suspend-0.6_beta1/config.c 2007-08-01 23:03:31.000000000 +0300 > @@ -18,7 +19,7 @@ > #include <string.h> > #include <getopt.h> > > -#include "config.h" > +#include "configparser.h" > #include "encrypt.h" > > /** > --- suspend.org/Makefile 2007-07-29 21:30:27.000000000 +0300 > +++ suspend-0.6_beta1/Makefile 2007-08-03 01:14:35.000000000 +0300 > @@ -23,7 +23,7 @@ LD_FLAGS=-L/usr/local/lib > BINARIES=s2disk s2both s2ram swap-offset resume > BINARIES_MIN=s2disk swap-offset > > -S2RAM_OBJ=vt.o config.o > -SWSUSP_OBJ=vt.o md5.o encrypt.o config.o loglevel.o splash.o bootsplash.o > +S2RAM_OBJ=vt.o configparser.o > +SWSUSP_OBJ=vt.o md5.o encrypt.o configparser.o loglevel.o splash.o > bootsplash.o > > S2RAM_LD_FLAGS = $(LD_FLAGS) > @@ -94,7 +94,7 @@ md5.o encrypt.o: %.o : %.c %.h md5.h > $(CC) $(CC_FLAGS) -DHAVE_INTTYPES_H -DHAVE_STDINT_H -c $< -o $@ > > # Simple objects with header > -config.o vt.o bootsplash.o splash.o splashy_funcs.o vbetool/vbetool.o > s2ram-ppc.o: %.o : %.c %.h > +configparser.o vt.o bootsplash.o splash.o splashy_funcs.o vbetool/vbetool.o > s2ram-ppc.o: %.o : %.c %.h > $(CC) $(CC_FLAGS) -c $< -o $@ > > # Simple object without header > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Splunk Inc. > Still grepping through log files to find problems? Stop. > Now Search log events and configuration files using AJAX and a browser. > Download your FREE copy of Splunk now >> http://get.splunk.com/ > _______________________________________________ > Suspend-devel mailing list > Suspend-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/suspend-devel > > -- "Premature optimization is the root of all evil." - Donald Knuth ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Suspend-devel mailing list Suspend-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/suspend-devel
