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: 22-Sep-2014 20:25:32
Branch: rpm-5_4 Handle: 2014092218253100
Modified files: (Branch: rpm-5_4)
rpm/python header-py.c rpmmodule.c
Log:
- gcc: remove clang pragma fluff.
Summary:
Revision Changes Path
1.110.4.16 +4 -0 rpm/python/header-py.c
1.180.2.12 +0 -1 rpm/python/rpmmodule.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/python/header-py.c
============================================================================
$ cvs diff -u -r1.110.4.15 -r1.110.4.16 header-py.c
--- rpm/python/header-py.c 18 Sep 2014 04:59:23 -0000 1.110.4.15
+++ rpm/python/header-py.c 22 Sep 2014 18:25:31 -0000 1.110.4.16
@@ -692,10 +692,14 @@
he->c = 1;
rc = headerPut(h, he, 0);
} break;
+#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wswitch"
+#endif
case RPM_CHAR_TYPE:
+#ifdef __clang__
#pragma clang diagnostic pop
+#endif
case RPM_UINT8_TYPE:
{ rpmuint8_t val = PyInt_AsUnsignedLongMask(item);
he->p.ui8p = &val;
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmmodule.c
============================================================================
$ cvs diff -u -r1.180.2.11 -r1.180.2.12 rpmmodule.c
--- rpm/python/rpmmodule.c 5 Sep 2014 19:31:46 -0000 1.180.2.11
+++ rpm/python/rpmmodule.c 22 Sep 2014 18:25:31 -0000 1.180.2.12
@@ -701,7 +701,6 @@
#endif
#ifdef DYING
-_rpmts_debug = -1;
rpmIncreaseVerbosity();
rpmIncreaseVerbosity();
#endif
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
