[Firebird-checkins] SF.net SVN: firebird:[60614] firebird/trunk/src

[<ale...@us...>]

Revision: 60614
          http://sourceforge.net/p/firebird/code/60614
Author:   alexpeshkoff
Date:     2015-02-03 14:24:54 +0000 (Tue, 03 Feb 2015)
Log Message:
-----------
WIP on CORE-3885: Firebird for Android, AI_V4MAPPED flag not supported, now server startup succeeds

Modified Paths:
--------------
    firebird/trunk/src/common/os/posix/os_utils.cpp
    firebird/trunk/src/remote/inet.cpp

Modified: firebird/trunk/src/common/os/posix/os_utils.cpp
===================================================================
--- firebird/trunk/src/common/os/posix/os_utils.cpp	2015-02-03 11:58:03 UTC (rev 60613)
+++ firebird/trunk/src/common/os/posix/os_utils.cpp	2015-02-03 14:24:54 UTC (rev 60614)
@@ -237,7 +237,11 @@
 // check if OS have support for IPv6 protocol
 bool isIPv6supported()
 {
+#ifdef ANDROID
+	return false;
+#else
 	return true;
+#endif
 }
 
 // setting flag is not absolutely required, therefore ignore errors here

Modified: firebird/trunk/src/remote/inet.cpp
===================================================================
--- firebird/trunk/src/remote/inet.cpp	2015-02-03 11:58:03 UTC (rev 60613)
+++ firebird/trunk/src/remote/inet.cpp	2015-02-03 14:24:54 UTC (rev 60614)
@@ -805,7 +805,11 @@
 	gai_hints.ai_protocol = IPPROTO_TCP;
 #endif
 
-	gai_hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG | (packet ? 0 : AI_PASSIVE);
+	gai_hints.ai_flags =
+#ifndef ANDROID
+		AI_V4MAPPED |
+#endif
+			AI_ADDRCONFIG | (packet ? 0 : AI_PASSIVE);
 
 	const char* host_str = (host.hasData() ? host.c_str() : NULL);
 	struct addrinfo* gai_result;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.