summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libzypp/libzypp/cstdio.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/libzypp/libzypp/cstdio.patch')
-rw-r--r--meta/recipes-extended/libzypp/libzypp/cstdio.patch49
1 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp/cstdio.patch b/meta/recipes-extended/libzypp/libzypp/cstdio.patch
deleted file mode 100644
index a021d589d3..0000000000
--- a/meta/recipes-extended/libzypp/libzypp/cstdio.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1include cstdio to get definitions of ::xxx functions which
2are now reported by gcc-4.7 as wanrings and warnings are treated
3as errors
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6Upstream-Status: Pending
7
8Index: git/zypp/ExternalProgram.cc
9===================================================================
10--- git.orig/zypp/ExternalProgram.cc 2012-06-01 16:25:17.098304709 -0700
11+++ git/zypp/ExternalProgram.cc 2012-06-01 16:25:37.254305681 -0700
12@@ -22,6 +22,7 @@
13 #include <cstring> // strsignal
14 #include <iostream>
15 #include <sstream>
16+#include <cstdio>
17
18 #include "zypp/base/Logger.h"
19 #include "zypp/base/String.h"
20Index: git/zypp/PluginScript.cc
21===================================================================
22--- git.orig/zypp/PluginScript.cc 2012-06-01 16:21:37.814294089 -0700
23+++ git/zypp/PluginScript.cc 2012-06-01 16:24:41.002302961 -0700
24@@ -14,6 +14,7 @@
25
26 #include <iostream>
27 #include <sstream>
28+#include <cstdio>
29
30 #include "zypp/base/LogTools.h"
31 #include "zypp/base/DefaultIntegral.h"
32@@ -336,7 +337,7 @@
33 if ( fd == -1 )
34 ZYPP_THROW( PluginScriptException( "Bad file descriptor" ) );
35
36- ::clearerr( filep );
37+ std::clearerr( filep );
38 std::string data;
39 {
40 PluginDebugBuffer _debug( data ); // dump receive buffer if PLUGIN_DEBUG
41@@ -370,7 +371,7 @@
42 int retval = select( fd+1, &rfds, NULL, NULL, &tv );
43 if ( retval > 0 ) // FD_ISSET( fd, &rfds ) will be true.
44 {
45- ::clearerr( filep );
46+ std::clearerr( filep );
47 }
48 else if ( retval == 0 )
49 {