From 7b4c7384b54c1bc8926534ada1459aa8725283e5 Mon Sep 17 00:00:00 2001
From: joss17 <joss17@users.sourceforge.net>
Date: Wed, 27 May 2009 20:59:48 +0000
Subject: [PATCH] Merge branch 'gcc44'

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1279 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/dht/b64.c                 | 1 +
 libretroshare/src/pqi/p3authmgr.cc          | 1 +
 libretroshare/src/pqi/p3notify.cc           | 1 +
 libretroshare/src/pqi/pqinetwork.cc         | 1 +
 libretroshare/src/rsiface/rsnotify.h        | 2 +-
 libretroshare/src/tcponudp/extaddrfinder.cc | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/libretroshare/src/dht/b64.c b/libretroshare/src/dht/b64.c
index f66ba2a0c..ae77a1877 100644
--- a/libretroshare/src/dht/b64.c
+++ b/libretroshare/src/dht/b64.c
@@ -243,6 +243,7 @@ void decodeblock( unsigned char in[4], unsigned char out[3] )
 #include <sstream>
 #include <iomanip>
 #include <string>
+#include <stdint.h>
 #include "b64.h"
 
 std::string displayBlock(unsigned char *arr, unsigned int len);
diff --git a/libretroshare/src/pqi/p3authmgr.cc b/libretroshare/src/pqi/p3authmgr.cc
index db2664e97..f9b56dba0 100644
--- a/libretroshare/src/pqi/p3authmgr.cc
+++ b/libretroshare/src/pqi/p3authmgr.cc
@@ -23,6 +23,7 @@
  *
  */
 
+#include <stdint.h>
 #include <iostream>
 #include "pqi/p3authmgr.h"
 
diff --git a/libretroshare/src/pqi/p3notify.cc b/libretroshare/src/pqi/p3notify.cc
index ef5308d53..b2412bce9 100644
--- a/libretroshare/src/pqi/p3notify.cc
+++ b/libretroshare/src/pqi/p3notify.cc
@@ -25,6 +25,7 @@
 
 
 #include "pqi/p3notify.h"
+#include <stdint.h>
 
 /* external reference point */
 RsNotify *rsNotify = NULL;
diff --git a/libretroshare/src/pqi/pqinetwork.cc b/libretroshare/src/pqi/pqinetwork.cc
index b940e79aa..3b0c4b2e7 100644
--- a/libretroshare/src/pqi/pqinetwork.cc
+++ b/libretroshare/src/pqi/pqinetwork.cc
@@ -31,6 +31,7 @@
 
 #include <errno.h>
 #include <iostream>
+#include <stdio.h>
 
 #include "util/rsdebug.h"
 #include <sstream>
diff --git a/libretroshare/src/rsiface/rsnotify.h b/libretroshare/src/rsiface/rsnotify.h
index 55ef4678f..685908c98 100644
--- a/libretroshare/src/rsiface/rsnotify.h
+++ b/libretroshare/src/rsiface/rsnotify.h
@@ -31,7 +31,7 @@
 #include <list>
 #include <iostream>
 #include <string>
-
+#include <stdint.h>
 
 class RsNotify;
 extern RsNotify   *rsNotify;
diff --git a/libretroshare/src/tcponudp/extaddrfinder.cc b/libretroshare/src/tcponudp/extaddrfinder.cc
index 90748089e..e394b1616 100644
--- a/libretroshare/src/tcponudp/extaddrfinder.cc
+++ b/libretroshare/src/tcponudp/extaddrfinder.cc
@@ -13,6 +13,7 @@
 #include <set>
 #include <vector>
 #include <algorithm>
+#include <stdio.h>
 
 static const std::string ADDR_AGENT  = "Mozilla/5.0";