I am sorry. I am trying to merge manually some old patches from the popt 1.17 branch to HEAD and have conflict, dunno why. Thanks for checking, jbj.
Best ----Messaggio originale---- Da: Jeff Johnson Inviato: 02/07/2013, 18:16 A: rpm-...@rpm5.org Oggetto: [CVS] RPM: popt/ system.h RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: popt Date: 02-Jul-2013 18:16:28 Branch: HEAD Handle: 2013070216162800 Modified files: popt system.h Log: - fix: add missing #endif Summary: Revision Changes Path 1.28 +1 -0 popt/system.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: popt/system.h ============================================================================ $ cvs diff -u -r1.27 -r1.28 system.h --- popt/system.h 2 Jul 2013 15:45:08 -0000 1.27 +++ popt/system.h 2 Jul 2013 16:16:28 -0000 1.28 @@ -210,6 +210,7 @@ #define getenv(_s) __secure_getenv(_s) #endif #endif +#endif /* Include configmake.h autogenerated from Makefile.am */ #include "configmake.h" @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-...@rpm5.org ______________________________________________________________________ RPM Package Manager http://rpm5.org Developer Communication List rpm-devel@rpm5.org
