From eac2c010c312c9ea0f8cdffae343346ab28e87d8 Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Sun, 1 Jul 2012 20:08:28 +0000
Subject: [PATCH] Fixed compile on Windows.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5264 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/libretroshare.pro | 2 +-
 libretroshare/src/pgp/pgphandler.cc | 5 +++++
 openpgpsdk/src/src.pro              | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index a0f1ed842..8957e17e4 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -303,7 +303,7 @@ win32 {
 	ZLIB_DIR = ../../../zlib-1.2.3
 	SSL_DIR = ../../../../OpenSSL
 
-	OPENPGPSDK_DIR = ../../openpgpsdk/include
+	OPENPGPSDK_DIR = ../../openpgpsdk/src
 	INCLUDEPATH *= $${OPENPGPSDK_DIR}
 
 	INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${PTHREADS_DIR} $${ZLIB_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src
diff --git a/libretroshare/src/pgp/pgphandler.cc b/libretroshare/src/pgp/pgphandler.cc
index 338dd3cdb..c4e28319a 100644
--- a/libretroshare/src/pgp/pgphandler.cc
+++ b/libretroshare/src/pgp/pgphandler.cc
@@ -6,6 +6,10 @@
 #include <string.h>
 #include <sys/stat.h>
 
+#ifdef WINDOWS_SYS
+#include "util/rsstring.h"
+#endif
+
 extern "C" {
 #include <openpgpsdk/util.h>
 #include <openpgpsdk/crypto.h>
@@ -952,6 +956,7 @@ bool PGPHandler::locked_syncSecretKeyring()
 {
 	struct stat64 buf ;
 #ifdef WINDOWS_SYS
+	std::wstring wfullname;
 	librs::util::ConvertUtf8ToUtf16(_secring_path, wfullname);
 	if(-1 == _wstati64(wfullname.c_str(), &buf))
 #else
diff --git a/openpgpsdk/src/src.pro b/openpgpsdk/src/src.pro
index e62a39f1e..ebdee404b 100644
--- a/openpgpsdk/src/src.pro
+++ b/openpgpsdk/src/src.pro
@@ -21,7 +21,7 @@ win32 {
 	ZLIB_DIR = ../../../zlib-1.2.3
 	BZIP_DIR = ../../../bzip2-1.0.6
 
-	INCLUDEPATH += . $${SSL_DIR}/include $${ZLIB_DIR} $${BZIP_DIR}
+	INCLUDEPATH += $${SSL_DIR}/include $${ZLIB_DIR} $${BZIP_DIR}
 }
 
 # Input