mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Merge branch 'gcc44'
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1279 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
0a0816cb77
commit
7b4c7384b5
@ -243,6 +243,7 @@ void decodeblock( unsigned char in[4], unsigned char out[3] )
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <stdint.h>
|
||||||
#include "b64.h"
|
#include "b64.h"
|
||||||
|
|
||||||
std::string displayBlock(unsigned char *arr, unsigned int len);
|
std::string displayBlock(unsigned char *arr, unsigned int len);
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include "pqi/p3authmgr.h"
|
#include "pqi/p3authmgr.h"
|
||||||
|
|
||||||
|
@ -25,6 +25,7 @@
|
|||||||
|
|
||||||
|
|
||||||
#include "pqi/p3notify.h"
|
#include "pqi/p3notify.h"
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
/* external reference point */
|
/* external reference point */
|
||||||
RsNotify *rsNotify = NULL;
|
RsNotify *rsNotify = NULL;
|
||||||
|
@ -31,6 +31,7 @@
|
|||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
#include "util/rsdebug.h"
|
#include "util/rsdebug.h"
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
#include <list>
|
#include <list>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
class RsNotify;
|
class RsNotify;
|
||||||
extern RsNotify *rsNotify;
|
extern RsNotify *rsNotify;
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
#include <set>
|
#include <set>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
static const std::string ADDR_AGENT = "Mozilla/5.0";
|
static const std::string ADDR_AGENT = "Mozilla/5.0";
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user