RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 27-Feb-2016 21:36:51
Branch: rpm-5_4 Handle: 2016022720365001
Modified files: (Branch: rpm-5_4)
rpm system.h
rpm/lib librpm.vers
rpm/rpmio librpmio.vers rpmio.h
Log:
Define the x* wrappers for uclibc as well
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.k...@gmail.com>
Summary:
Revision Changes Path
1.77.2.4 +4 -0 rpm/lib/librpm.vers
2.199.2.53 +4 -0 rpm/rpmio/librpmio.vers
1.97.2.6 +2 -1 rpm/rpmio/rpmio.h
2.129.2.14 +1 -1 rpm/system.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/librpm.vers
============================================================================
$ cvs diff -u -r1.77.2.3 -r1.77.2.4 librpm.vers
--- rpm/lib/librpm.vers 3 Sep 2014 19:30:41 -0000 1.77.2.3
+++ rpm/lib/librpm.vers 27 Feb 2016 20:36:51 -0000 1.77.2.4
@@ -406,6 +406,10 @@
specedit;
strict_erasures;
XrpmtsiInit;
+ xmalloc;
+ xrealloc;
+ xcalloc;
+ xstrdup;
local:
*;
};
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
============================================================================
$ cvs diff -u -r2.199.2.52 -r2.199.2.53 librpmio.vers
--- rpm/rpmio/librpmio.vers 25 Oct 2014 18:11:58 -0000 2.199.2.52
+++ rpm/rpmio/librpmio.vers 27 Feb 2016 20:36:50 -0000 2.199.2.53
@@ -1455,6 +1455,10 @@
_mongoc_write_result_init;
_mongoc_write_result_merge;
_mongoc_write_result_merge_legacy;
+ xmalloc;
+ xrealloc;
+ xcalloc;
+ xstrdup;
local:
*;
};
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.h
============================================================================
$ cvs diff -u -r1.97.2.5 -r1.97.2.6 rpmio.h
--- rpm/rpmio/rpmio.h 27 Sep 2014 15:51:23 -0000 1.97.2.5
+++ rpm/rpmio/rpmio.h 27 Feb 2016 20:36:50 -0000 1.97.2.6
@@ -23,7 +23,8 @@
*/
/*@{*/
#if !defined(__LCLINT__) && !defined(__UCLIBC__) && defined(__GLIBC__) && \
- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
+ (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) && \
+ !defined(__UCLIBC__)
#define USE_COOKIE_SEEK_POINTER 1
typedef _IO_off64_t _libio_off_t;
typedef _libio_off_t * _libio_pos_t;
@@ .
patch -p0 <<'@@ .'
Index: rpm/system.h
============================================================================
$ cvs diff -u -r2.129.2.13 -r2.129.2.14 system.h
--- rpm/system.h 16 Feb 2015 21:48:21 -0000 2.129.2.13
+++ rpm/system.h 27 Feb 2016 20:36:51 -0000 2.129.2.14
@@ -489,7 +489,7 @@
#endif /* defined(__LCLINT__) */
/* Memory allocation via macro defs to get meaningful locations from
mtrace() */
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__UCLIBC__)
#define xmalloc(_size) (malloc(_size) ? : vmefail(_size))
#define xcalloc(_nmemb, _size) (calloc((_nmemb), (_size)) ? :
vmefail(_size))
#define xrealloc(_ptr, _size) (realloc((_ptr), (_size)) ? :
vmefail(_size))
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
