From 79904ebc48b0103c5a11dcfb76ee7c37399a213a Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Fri, 10 Oct 2014 15:57:55 +0200 Subject: [multiple changes] 2014-10-10 Gary Dismukes * a-coinho-shared.adb: Minor typo fix. * prj-env.ads: Minor reformatting. 2014-10-10 Hristian Kirtchev * sem_res.adb (Resolve_String_Literal): Do not generate a string literal subtype for the default expression of a formal parameter in GNATprove mode. 2014-10-10 Yannick Moy * errout.adb (SPARK_Msg_N): Issue error unless SPARK_Mode is Off. 2014-10-10 Ed Schonberg * exp_ch5.adb (Expand_Formal_Container_Element_Loop): Analyze declaration for loop parameter before rest of loop, and set entity kind to prevent assignments to it in the user code. * sem_ch3.adb (Analyze_Object_Contract): No contracts apply to the loop parameter in an element iteration over o formal container. 2014-10-10 Robert Dewar * gnat_ugn.texi: Document use of user-level routines to handle e.g. col major arrays. 2014-10-10 Doug Rupp * s-osinte-android.adb: Fix misspelling. * gsocket.h: Tweak the Android quirks. 2014-10-10 Robert Dewar * errout.ads (SPARK_Msg_N): Fix spec to match change in body. From-SVN: r216083 --- gcc/ada/gsocket.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gcc/ada/gsocket.h') diff --git a/gcc/ada/gsocket.h b/gcc/ada/gsocket.h index 2034137..4f9448b 100644 --- a/gcc/ada/gsocket.h +++ b/gcc/ada/gsocket.h @@ -29,8 +29,7 @@ * * ****************************************************************************/ -#if defined(__nucleus__) || defined(VTHREADS) || defined(__ANDROID__) \ - || defined(__PikeOS__) +#if defined(__nucleus__) || defined(VTHREADS) || defined(__PikeOS__) /* Sockets not supported on these platforms. */ #undef HAVE_SOCKETS @@ -204,8 +203,13 @@ #include #endif +#ifdef __ANDROID__ +#include +#include +#endif + #if defined (_AIX) || defined (__FreeBSD__) || defined (__hpux__) || \ - defined (_WIN32) || defined (__APPLE__) + defined (_WIN32) || defined (__APPLE__) || defined (__ANDROID__) # define HAVE_THREAD_SAFE_GETxxxBYyyy 1 #elif defined (linux) || defined (__GLIBC__) || \ -- cgit v1.1