RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 25-Jul-2007 08:17:29 Branch: HEAD Handle: 2007072507172900 Modified files: rpm/rpmconstant constant.c rpmconstant.c rpmconstant_internal.c Log: rpmconstant.h already includes system.h and this way has everything available, so remove the additional includes except <popt.h>. This especially resolves a double-inclusion problem which the GCC under AIX hates very much Summary: Revision Changes Path 1.2 +1 -5 rpm/rpmconstant/constant.c 1.4 +1 -2 rpm/rpmconstant/rpmconstant.c 1.3 +1 -2 rpm/rpmconstant/rpmconstant_internal.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmconstant/constant.c ============================================================================ $ cvs diff -u -r1.1 -r1.2 constant.c --- rpm/rpmconstant/constant.c 21 Jul 2007 17:28:19 -0000 1.1 +++ rpm/rpmconstant/constant.c 25 Jul 2007 06:17:29 -0000 1.2 @@ -1,14 +1,10 @@ /* Nanar <[EMAIL PROTECTED]> - * $Id: constant.c,v 1.1 2007/07/21 17:28:19 nanardon Exp $ + * $Id: constant.c,v 1.2 2007/07/25 06:17:29 rse Exp $ */ -#include <stdio.h> -#include <string.h> #include "rpmconstant.h" #include <popt.h> - - int main(int argc, const char *argv[]) { char * context =NULL; char c; @@ . patch -p0 <<'@@ .' Index: rpm/rpmconstant/rpmconstant.c ============================================================================ $ cvs diff -u -r1.3 -r1.4 rpmconstant.c --- rpm/rpmconstant/rpmconstant.c 21 Jul 2007 20:25:07 -0000 1.3 +++ rpm/rpmconstant/rpmconstant.c 25 Jul 2007 06:17:29 -0000 1.4 @@ -1,8 +1,7 @@ /* Nanar <[EMAIL PROTECTED]> - * $Id: rpmconstant.c,v 1.3 2007/07/21 20:25:07 rse Exp $ + * $Id: rpmconstant.c,v 1.4 2007/07/25 06:17:29 rse Exp $ */ -#include <string.h> #define RPMCONSTANT_INTERNAL #include "rpmconstant.h" @@ . patch -p0 <<'@@ .' Index: rpm/rpmconstant/rpmconstant_internal.c ============================================================================ $ cvs diff -u -r1.2 -r1.3 rpmconstant_internal.c --- rpm/rpmconstant/rpmconstant_internal.c 21 Jul 2007 18:44:18 -0000 1.2 +++ rpm/rpmconstant/rpmconstant_internal.c 25 Jul 2007 06:17:29 -0000 1.3 @@ -1,8 +1,7 @@ /* Nanar <[EMAIL PROTECTED]> - * $Id: rpmconstant_internal.c,v 1.2 2007/07/21 18:44:18 rse Exp $ + * $Id: rpmconstant_internal.c,v 1.3 2007/07/25 06:17:29 rse Exp $ */ -#include <string.h> #define RPMCONSTANT_INTERNAL #include "rpmconstant.h" @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org