Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 00:49:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #409 from sehraf/pr-upnp-version

Browse Source 
Add information about the utilized UPnP library
This commit is contained in:
Cyril Soler 2016-06-07 11:00:34 -04:00
commit 0e857096c1
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libretroshare/src/rsserver/p3face-info.cc
View File

@ -35,6 +35,14 @@
#include <sqlcipher/sqlite3.h> #include <sqlcipher/sqlite3.h>
#endif #endif
#ifndef RS_ENABLE_ZCNATASSIST
#ifdef RS_USE_LIBUPNP
#include "upnp/upnpconfig.h"
#else
#include "miniupnpc/miniupnpc.h"
#endif // RS_USE_LIBUPNP
#endif // RS_ENABLE_ZCNATASSIST
std::string RsServer::getSQLCipherVersion() std::string RsServer::getSQLCipherVersion()
{ {
sqlite3* mDb; sqlite3* mDb;
@ -84,5 +92,12 @@ void RsServer::getLibraries(std::list<RsLibraryInfo> &libraries)
#ifndef NO_SQLCIPHER #ifndef NO_SQLCIPHER
libraries.push_back(RsLibraryInfo("SQLCipher", getSQLCipherVersion())); libraries.push_back(RsLibraryInfo("SQLCipher", getSQLCipherVersion()));
#endif #endif
#ifndef RS_ENABLE_ZCNATASSIST
#ifdef RS_USE_LIBUPNP
libraries.push_back(RsLibraryInfo("UPnP (libupnp)", UPNP_VERSION_STRING));
#else
libraries.push_back(RsLibraryInfo("UPnP (MiniUPnP)", MINIUPNPC_VERSION));
#endif // RS_USE_LIBUPNP
#endif // RS_ENABLE_ZCNATASSIST
libraries.push_back(RsLibraryInfo("Zlib", ZLIB_VERSION)); libraries.push_back(RsLibraryInfo("Zlib", ZLIB_VERSION));
} }