Merge branch 'ipv6' of github.com:fmorgner/umurmur into ipv6

Conflicts:
	src/client.c
	src/server.c

diff --git a/src/client.c b/src/client.c
index e0146f952ca46d44732a93ce93578bbe83264d81..526e1f4bf5f2fc35cee0b33e10dd5ecfba2e3d90 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -64,7 +64,7 @@ int iCodecAlpha, iCodecBeta;
 bool_t bPreferAlpha;
 
 extern int* udpsocks;
-extern bool hasv4;
+extern bool_t hasv4;
 
 void Client_init()
 {

diff --git a/src/server.c b/src/server.c
index 27244a2b95c2950a3624183dcfab61297e5d878b..4dee126dcf40f5b9cb68b195c5100a037f2f02bb 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -55,7 +55,7 @@ extern char *bindaddr6;
 extern int bindport;
 extern int bindport6;
 int* udpsocks;
-bool hasv4 = true, hasv6 = true;
+bool_t hasv4 = true, hasv6 = true;
 
 const int on = 1;
 int nofServerSocks = 4;