Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-27 15:47:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed compile on Windows.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7052 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-01-22 22:31:42 +00:00
parent ae5942733e
commit bb0d02f3dc
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libretroshare/src/rsserver/rsaccounts.cc
View file

@ -30,6 +30,10 @@
* *
*/ */
#ifdef WINDOWS_SYS
#include "util/rswin.h"
#endif // WINDOWS_SYS
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -307,7 +311,7 @@ bool RsAccountsDetail::defaultBaseDirectory()
basedir += "/.retroshare6"; basedir += "/.retroshare6";
#else #else
if (RsInitConfig::portable) if (RsInit::isPortable())
{ {
// use directory "Data" in portable version // use directory "Data" in portable version
basedir = "Data"; basedir = "Data";
@ -866,14 +870,8 @@ bool RsAccountsDetail::copyGnuPGKeyrings()
std::string source_secret_keyring; std::string source_secret_keyring;
#ifdef WINDOWS_SYS #ifdef WINDOWS_SYS
if (RsInit::isPortable()) source_public_keyring = mBaseDirectory + "/gnupg/pubring.gpg";
{ source_secret_keyring = mBaseDirectory + "/gnupg/secring.gpg" ;
source_public_keyring = RsInit::RsConfigDirectory() + "/gnupg/pubring.gpg";
source_secret_keyring = RsInit::RsConfigDirectory() + "/gnupg/secring.gpg" ;
} else {
source_public_keyring = RsInitConfig::basedir + "/../gnupg/pubring.gpg" ;
source_secret_keyring = RsInitConfig::basedir + "/../gnupg/secring.gpg" ;
}
#else #else
char *env_gnupghome = getenv("GNUPGHOME") ; char *env_gnupghome = getenv("GNUPGHOME") ;

4
libretroshare/src/util/rsrecogn.cc
View file

@ -23,6 +23,10 @@
* *
*/ */
#ifdef WINDOWS_SYS
#include "util/rswin.h"
#endif // WINDOWS_SYS
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/evp.h> #include <openssl/evp.h>