Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-03 22:55:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix windows compile due to rsversion JSON API

Browse source
This commit is contained in:
Gioacchino Mazzurco 2019-11-28 16:29:10 +01:00
parent 6bae8237e1
commit 5bf8792bc5
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
7 changed files with 37 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libretroshare/src/jsonapi/jsonapi.cpp
View file

@ -17,8 +17,6 @@
* *
*******************************************************************************/
#include "jsonapi.h"
#include <string>
#include <sstream>
#include <memory>
@ -26,6 +24,9 @@
#include <vector>
#include <openssl/crypto.h>
#include "jsonapi.h"
#include "util/rsjson.h"
#include "retroshare/rsfiles.h"
#include "util/radix64.h"
@ -36,6 +37,7 @@
#include "util/rsurl.h"
#include "util/rstime.h"
#include "retroshare/rsevents.h"
#include "retroshare/rsversion.h"
// Generated at compile time
#include "jsonapi-includes.inl"
@ -644,3 +646,14 @@ void JsonApiServer::runloop()
RsInfo() << __PRETTY_FUNCTION__ << " finished!" << std::endl;
}
/*static*/ void RsJsonApi::version(
uint32_t& major, uint32_t& minor, uint32_t& mini, std::string& extra,
std::string& human )
{
major = RS_MAJOR_VERSION;
minor = RS_MINOR_VERSION;
mini = RS_MINI_VERSION;
extra = RS_EXTRA_VERSION;
human = RS_HUMAN_READABLE_VERSION;
}