RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 12-Oct-2009 19:07:26 Branch: HEAD Handle: 2009101217072600 Modified files: rpm/rpmdb librpmdb.vers logio.awk logio.c Log: - dbi: eliminate #include db_config.h everywhere. Summary: Revision Changes Path 1.74 +2 -0 rpm/rpmdb/librpmdb.vers 1.3 +1 -19 rpm/rpmdb/logio.awk 1.3 +0 -7 rpm/rpmdb/logio.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmdb/librpmdb.vers ============================================================================ $ cvs diff -u -r1.73 -r1.74 librpmdb.vers --- rpm/rpmdb/librpmdb.vers 10 Oct 2009 23:37:04 -0000 1.73 +++ rpm/rpmdb/librpmdb.vers 12 Oct 2009 17:07:26 -0000 1.74 @@ -88,9 +88,11 @@ logio_Link_log; logio_Lsetfilecon_log; logio_Mkdir_log; + logio_Mkdir_recover; logio_Mkfifo_log; logio_Mknod_log; logio_Rmdir_log; + logio_Rmdir_recover; logio_Symlink_log; logio_Unlink_log; logio_Utime_log; @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/logio.awk ============================================================================ $ cvs diff -u -r1.2 -r1.3 logio.awk --- rpm/rpmdb/logio.awk 8 Oct 2009 23:08:53 -0000 1.2 +++ rpm/rpmdb/logio.awk 12 Oct 2009 17:07:26 -0000 1.3 @@ -4,7 +4,7 @@ # # Copyright (c) 1996-2009 Oracle. All rights reserved. # -# $Id: logio.awk,v 1.2 2009/10/08 23:08:53 jbj Exp $ +# $Id: logio.awk,v 1.3 2009/10/12 17:07:26 jbj Exp $ # # This awk script generates all the log, print, and read routines for the DB @@ -79,12 +79,6 @@ # Start .c files. printf("/* Do not edit: automatically built by logio.awk. */\n\n")\ > CFILE - printf("#include \"db_config.h\"\n") >> CFILE - printf("#undef\tPACKAGE_BUGREPORT\n") >> CFILE - printf("#undef\tPACKAGE_NAME\n") >> CFILE - printf("#undef\tPACKAGE_STRING\n") >> CFILE - printf("#undef\tPACKAGE_TARNAME\n") >> CFILE - printf("#undef\tPACKAGE_VERSION\n\n") >> CFILE printf("#include \"system.h\"\n\n") >> CFILE printf("#include <rpmio.h>\n\n") >> CFILE if (!dbprivate) { @@ -96,12 +90,6 @@ printf("/* Do not edit: automatically built by logio.awk. */\n\n")\ > PFILE - printf("#include \"db_config.h\"\n") >> PFILE - printf("#undef\tPACKAGE_BUGREPORT\n") >> PFILE - printf("#undef\tPACKAGE_NAME\n") >> PFILE - printf("#undef\tPACKAGE_STRING\n") >> PFILE - printf("#undef\tPACKAGE_TARNAME\n") >> PFILE - printf("#undef\tPACKAGE_VERSION\n\n") >> PFILE printf("#include \"system.h\"\n\n") >> PFILE printf("#include <rpmio.h>\n\n") >> PFILE if (!dbprivate) { @@ -123,12 +111,6 @@ # Write recovery template file headers if (dbprivate) { # This assumes we're doing DB recovery. - printf("#include \"db_config.h\"\n") > TFILE - printf("#undef\tPACKAGE_BUGREPORT\n") >> TFILE - printf("#undef\tPACKAGE_NAME\n") >> TFILE - printf("#undef\tPACKAGE_STRING\n") >> TFILE - printf("#undef\tPACKAGE_TARNAME\n") >> TFILE - printf("#undef\tPACKAGE_VERSION\n\n") >> TFILE printf("#include \"system.h\"\n\n") >> TFILE printf("#include <rpmio.h>\n\n") >> TFILE printf("#include \"db_int.h\"\n") >> TFILE @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/logio.c ============================================================================ $ cvs diff -u -r1.2 -r1.3 logio.c --- rpm/rpmdb/logio.c 8 Oct 2009 23:08:53 -0000 1.2 +++ rpm/rpmdb/logio.c 12 Oct 2009 17:07:26 -0000 1.3 @@ -1,11 +1,4 @@ -#include "db_config.h" -#undef PACKAGE_BUGREPORT -#undef PACKAGE_NAME -#undef PACKAGE_STRING -#undef PACKAGE_TARNAME -#undef PACKAGE_VERSION - #include "system.h" #include <rpmio.h> @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
