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: 21-Jul-2007 22:25:07
Branch: HEAD Handle: 2007072121250700
Modified files:
rpm/rpmconstant rpmconstant.c
Log:
always undefine system.h's xcalloc to not add a dependency to rpmio's
vmefail function
Summary:
Revision Changes Path
1.3 +2 -3 rpm/rpmconstant/rpmconstant.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmconstant/rpmconstant.c
============================================================================
$ cvs diff -u -r1.2 -r1.3 rpmconstant.c
--- rpm/rpmconstant/rpmconstant.c 21 Jul 2007 18:44:18 -0000 1.2
+++ rpm/rpmconstant/rpmconstant.c 21 Jul 2007 20:25:07 -0000 1.3
@@ -1,14 +1,13 @@
/* Nanar <[EMAIL PROTECTED]>
- * $Id: rpmconstant.c,v 1.2 2007/07/21 18:44:18 rse Exp $
+ * $Id: rpmconstant.c,v 1.3 2007/07/21 20:25:07 rse Exp $
*/
#include <string.h>
#define RPMCONSTANT_INTERNAL
#include "rpmconstant.h"
-#ifndef xcalloc
+#undef xcalloc
#define xcalloc(n,s) calloc((n),(s))
-#endif
rpmconst rpmconstNew()
{
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
