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: 03-May-2017 16:46:06
Branch: rpm-5_4 Handle: 2017050314460501
Modified files: (Branch: rpm-5_4)
rpm/python system-py.h
rpm/rpmio rpmpython.c
Log:
- python: fix: avoid warnings with AutoFu tests for stat/fstat.
Summary:
Revision Changes Path
1.1.2.4 +4 -0 rpm/python/system-py.h
2.16.2.13 +2 -0 rpm/rpmio/rpmpython.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/python/system-py.h
============================================================================
$ cvs diff -u -r1.1.2.3 -r1.1.2.4 system-py.h
--- rpm/python/system-py.h 19 Jun 2016 08:53:46 -0000 1.1.2.3
+++ rpm/python/system-py.h 3 May 2017 14:46:05 -0000 1.1.2.4
@@ -13,9 +13,13 @@
#include <sys/types.h>
#endif
+#define DONT_HAVE_STAT /* XXX /usr/include/python2.7/pyport.h
*/
+#define DONT_HAVE_FSTAT /* XXX /usr/include/python2.7/pyport.h
*/
#define uuid_t __darwin_uuid_t /* XXX Mac OS X dares to be different.
*/
#include <Python.h>
#undef __darwin_uuid_t /* XXX Mac OS X dares to be different.
*/
+#undef DONT_HAVE_FSTAT /* XXX /usr/include/python2.7/pyport.h
*/
+#undef DONT_HAVE_STAT /* XXX /usr/include/python2.7/pyport.h
*/
#include <structmember.h>
#if ((PY_MAJOR_VERSION << 8) | (PY_MINOR_VERSION << 0)) < 0x0204
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpython.c
============================================================================
$ cvs diff -u -r2.16.2.12 -r2.16.2.13 rpmpython.c
--- rpm/rpmio/rpmpython.c 3 May 2017 14:42:37 -0000 2.16.2.12
+++ rpm/rpmio/rpmpython.c 3 May 2017 14:46:06 -0000 2.16.2.13
@@ -6,6 +6,8 @@
#define DONT_HAVE_STAT /* XXX /usr/include/python2.7/pyport.h
*/
#define DONT_HAVE_FSTAT /* XXX /usr/include/python2.7/pyport.h
*/
#include <Python.h>
+#undef DONT_HAVE_FSTAT
+#undef DONT_HAVE_STAT
#include <cStringIO.h>
#endif
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
