[Qemu-devel] Re: [PATCH 03/32] change definition of FILE for linux

[Glauber Costa <glommer@redhat.com>]

On Thu, Oct 23, 2008 at 08:52:52AM -0500, Anthony Liguori wrote:
> Glauber Costa wrote:
>> use _IO_FILE, as it seems to be the case.
>>   
>
> Why?  What is this fixing?
>
> It seems to work fine today and I don't see how this is related to the  
> series.

It's not possible to include exec.h into kqemu.c without it, because it conflicts
with virtually everything from stdio.h

The inclusion of exec.h is necessary for the cpu_exec patch, since we'll be using symbols
defined in that header. OTOH, those symbols are mostly macros that cast env->something, and
if really needed, I can use the env-> versions instead.

>
> Regards,
>
> Anthony Liguori
>
>> Signed-off-by: Glauber Costa <glommer@redhat.com>
>> ---
>>  dyngen-exec.h |    6 ++++++
>>  1 files changed, 6 insertions(+), 0 deletions(-)
>>
>> diff --git a/dyngen-exec.h b/dyngen-exec.h
>> index 9260b6f..826ff46 100644
>> --- a/dyngen-exec.h
>> +++ b/dyngen-exec.h
>> @@ -27,6 +27,10 @@
>>  #define _FILEDEFED
>>  #endif
>>
>> +#ifdef __linux__
>> +#define __FILE_defined
>> +#endif
>> +
>>  /* NOTE: standard headers should be used with special care at this
>>     point because host CPU registers are used as global variables. Some
>>     host headers do not allow that. */
>> @@ -84,6 +88,8 @@ typedef void * host_reg_t;
>>
>>  #ifdef _BSD
>>  typedef struct __sFILE FILE;
>> +#elif defined(__linux__)
>> +typedef struct _IO_FILE FILE;
>>  #else
>>  typedef struct FILE FILE;
>>  #endif
>>   
>