fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-20 16:16:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Throw error if attempting to use both xmlrpc-c and tinyxml2

Browse Source
This commit is contained in:
kannibalox
2024-10-27 17:08:27 -04:00
committed by Jari Sundell
parent b360a734f1
commit 3a8e462bd3
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+4
View File
@@ -58,6 +58,10 @@ AC_LANG_POP(C++)
TORRENT_WITH_TINYXML2 TORRENT_WITH_TINYXML2
#if test ${with_xmlrpc_tinyxml2+y} && test ${with_xmlrpc_c+y}; then
# AC_MSG_ERROR([--with-xmlrpc-c and --with-xmlrpc-tinyxml2 cannot be used together. Please choose only one])
#fi
AC_DEFINE(HAVE_CONFIG_H, 1, true if config.h was included) AC_DEFINE(HAVE_CONFIG_H, 1, true if config.h was included)
AC_DEFINE(USER_AGENT, [std::string(PACKAGE "/" VERSION "/") + torrent::version()], Http user agent) AC_DEFINE(USER_AGENT, [std::string(PACKAGE "/" VERSION "/") + torrent::version()], Http user agent)
src/rpc/xmlrpc_c.cc
+4
View File
@@ -37,6 +37,10 @@
#include "config.h" #include "config.h"
#ifdef HAVE_XMLRPC_C #ifdef HAVE_XMLRPC_C
#ifdef HAVE_XMLRPC_TINYXML2
#error HAVE_XMLRPC_C and HAVE_XMLRPC_TINYXML2 cannot be used together. Please choose only one
#endif
#include <cctype> #include <cctype>
#include <string> #include <string>
src/rpc/xmlrpc_tinyxml2.cc
+4 -3
View File
@@ -37,7 +37,9 @@
#include "config.h" #include "config.h"
#ifdef HAVE_XMLRPC_TINYXML2 #ifdef HAVE_XMLRPC_TINYXML2
#ifndef HAVE_XMLRPC_C #ifdef HAVE_XMLRPC_C
#error HAVE_XMLRPC_C and HAVE_XMLRPC_TINYXML2 cannot be used together. Please choose only one
#endif
#include <cctype> #include <cctype>
#include <string> #include <string>
@@ -449,5 +451,4 @@ bool XmlRpc::is_valid() const { return m_isValid; }
} }
#endif // ifndef HAVE_XMLRPC_C #endif
#endif // ifdef HAVE_XMLRPC_TINYXML2