base/Gettext.h must not be included by any zypp header, include it

in .cc files instead.
Otherwise zypp would export its idea about the _ macro to any
application using zypp, causing conflicts with their own _ and
confusing Bubli.

diff --git a/zypp/base/Exception.h b/zypp/base/Exception.h
index 040f72e..e9c3253 100644 (file)
--- a/zypp/base/Exception.h
+++ b/zypp/base/Exception.h
@@ -16,8 +16,6 @@
 #include <iosfwd>
 #include <stdexcept>
 
-#include "zypp/base/Gettext.h"
-
 ///////////////////////////////////////////////////////////////////
 namespace zypp
 { /////////////////////////////////////////////////////////////////

diff --git a/zypp/repo/RepoProvideFile.cc b/zypp/repo/RepoProvideFile.cc
index 38c7a8d..3e22b25 100644 (file)
--- a/zypp/repo/RepoProvideFile.cc
+++ b/zypp/repo/RepoProvideFile.cc
@@ -14,6 +14,7 @@
 #include <sstream>
 #include <set>
 
+#include "zypp/base/Gettext.h"
 #include "zypp/base/Logger.h"
 #include "zypp/repo/RepoProvideFile.h"
 #include "zypp/ZYppCallbacks.h"