Author: mvidner Date: Wed Apr 16 17:52:37 2008 New Revision: 46760 URL: http://svn.opensuse.org/viewcvs/yast?rev=46760&view=rev Log: a nicer workaround for the naming conflict with LOG_DEBUG et al. (bnc#288442) Modified: trunk/openwsman-yast/src/yast_yast.cc Modified: trunk/openwsman-yast/src/yast_yast.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/openwsman-yast/src/yast_yast.cc?r... ============================================================================== --- trunk/openwsman-yast/src/yast_yast.cc (original) +++ trunk/openwsman-yast/src/yast_yast.cc Wed Apr 16 17:52:37 2008 @@ -9,23 +9,6 @@ #define y2log_component "openwsman" -#include <wsman-xml-api.h> - -#ifdef LOG_DEBUG -#undef LOG_DEBUG -#endif -#ifdef LOG_WARNING -#undef LOG_WARNING -#endif -#ifdef error -#undef error -#endif -#ifdef warning -#undef warning -#endif -#ifdef debug -#undef debug -#endif #include <ycp/ExecutionEnvironment.h> #include <y2/Y2Component.h> @@ -42,6 +25,7 @@ #include "yast.h" +#include <wsman-xml-api.h> void yast_initialize() -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org