fixes/workarounds for GCC

git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@83 57ff6487-cd31-0410-9ec3-f628ee90f5f0

3 files changed, 7 insertions, 2 deletions

diff --git a/filters.h b/filters.h
index cc33e28..afd3357 100644
--- a/filters.h
+++ b/filters.h
@@ -398,7 +398,7 @@ public:
 	void Initialize(const NameValuePairs &parameters, int propagation)
 		{ChannelInitialize(NULL_CHANNEL, parameters, propagation);}
 	byte * CreatePutSpace(unsigned int &size)
-		{return m_target ? m_target->CreatePutSpace(size) : (size=0, NULL);}
+		{return m_target ? m_target->CreatePutSpace(size) : (byte *)(size=0, NULL);}
 	unsigned int Put2(const byte *begin, unsigned int length, int messageEnd, bool blocking)
 		{return m_target ? m_target->Put2(begin, length, GetPassSignals() ? messageEnd : 0, blocking) : 0;}
 	bool Flush(bool hardFlush, int propagation=-1, bool blocking=true)
@@ -408,7 +408,7 @@ public:
 
 	void ChannelInitialize(const std::string &channel, const NameValuePairs &parameters=g_nullNameValuePairs, int propagation=-1);
 	byte * ChannelCreatePutSpace(const std::string &channel, unsigned int &size)
-		{return m_target ? m_target->ChannelCreatePutSpace(channel, size) : (size=0, NULL);}
+		{return m_target ? m_target->ChannelCreatePutSpace(channel, size) : (byte *)(size=0, NULL);}
 	unsigned int ChannelPut2(const std::string &channel, const byte *begin, unsigned int length, int messageEnd, bool blocking)
 		{return m_target ? m_target->ChannelPut2(channel, begin, length, GetPassSignals() ? messageEnd : 0, blocking) : 0;}
 	unsigned int ChannelPutModifiable2(const std::string &channel, byte *begin, unsigned int length, int messageEnd, bool blocking)
diff --git a/hrtimer.cpp b/hrtimer.cpp
index 9c8da7d..3396aea 100644
--- a/hrtimer.cpp
+++ b/hrtimer.cpp
@@ -2,6 +2,7 @@
 
 #include "pch.h"
 #include "hrtimer.h"
+#include "misc.h"
 #include <stddef.h>		// for NULL
 
 #ifdef HIGHRES_TIMER_AVAILABLE
diff --git a/test.cpp b/test.cpp
index fafcb2d..1309643 100644
--- a/test.cpp
+++ b/test.cpp
@@ -31,6 +31,10 @@
 #include <windows.h>
 #endif
 
+#ifdef USE_BERKELEY_STYLE_SOCKETS
+#include <netinet/in.h>
+#endif
+
 #if (_MSC_VER >= 1000)
 #include <crtdbg.h>		// for the debug heap
 #endif