[Mesa-dev] [PATCH 06/15] main: Remove problematic #include on Android

[Chad Versace]

On 08/04/2011 08:43 AM, Eric Anholt wrote:
> On Thu,  4 Aug 2011 02:47:15 -0700, Chad Versace <chad at chad-versace.us> wrote:
>> Remove ``#include <fpu_control.h>`` from compiler.h.
>>
>> Note: This is in preparation for porting i965 to Android.
>> CC: Chia-I Wu <olv at lunarg.com>,
>> CC: Chih-Wei Huang <cwhuang at android-x86.org>
>> Signed-off-by: Chad Versace <chad at chad-versace.us>
>> ---
>>  src/mesa/main/compiler.h |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
>> index d736fdf..3981644 100644
>> --- a/src/mesa/main/compiler.h
>> +++ b/src/mesa/main/compiler.h
>> @@ -45,7 +45,7 @@
>>  #include <stdlib.h>
>>  #include <stdio.h>
>>  #include <string.h>
>> -#if defined(__linux__) && defined(__i386__)
>> +#if defined(__linux__) && defined(__i386__) && !defined(ANDROID)
>>  #include <fpu_control.h>
>>  #endif
>>  #include <float.h>
>> -- 
>> 1.7.6
> 
> I've noticed that this include is missing on my debian cross-build
> environment too.  Can we tell if it's even required on linux 386 any
> more?  I doesn't appear to be to me.

You're right. compiler.h uses no symbols from fpu_control.h.

-- 
Chad Versace
chad at chad-versace.us

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 900 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20110804/bd6d3887/attachment.pgp>