[Mesa-dev] [PATCH 4/7] mesa: move finite macro to imports.h

[Emil Velikov]

On 28 February 2015 at 15:40, Brian Paul <brianp at vmware.com> wrote:
> On 02/28/2015 03:50 AM, Emil Velikov wrote:
>>
>> On 28/02/15 00:47, Brian Paul wrote:
>>>
>>> Move it to the only place it's used.
>>> ---
>>>   src/mesa/main/compiler.h | 8 --------
>>>   src/mesa/main/imports.h  | 8 ++++++++
>>>   2 files changed, 8 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
>>> index 9d7df05..796870d 100644
>>> --- a/src/mesa/main/compiler.h
>>> +++ b/src/mesa/main/compiler.h
>>> @@ -64,14 +64,6 @@ extern "C" {
>>>
>>>
>>>   /**
>>> - * finite macro.
>>> - */
>>> -#if defined(_MSC_VER)
>>> -#  define finite _finite
>>> -#endif
>>> -
>>> -
>>> -/**
>>>    * Disable assorted warnings
>>>    */
>>>   #if defined(_WIN32) && !defined(__CYGWIN__)
>>> diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
>>> index 838b985..7921000 100644
>>> --- a/src/mesa/main/imports.h
>>> +++ b/src/mesa/main/imports.h
>>> @@ -121,6 +121,14 @@ static inline GLfloat LOG2(GLfloat x)
>>>
>>>
>>>
>>> +/**
>>> + * finite macro.
>>> + */
>>> +#if defined(_MSC_VER)
>>> +#  define finite _finite
>>> +#endif
>>> +
>>> +
>>>   /***
>>>    *** IS_INF_OR_NAN: test if float is infinite or NaN
>>>    ***/
>>>
>> With isfinite already defined in c99_math.h I believe we can just drop the
>> define and simplify the IS_INF_OR_NAN below ?
>
>
> Yeah, probably.  However, I'm a little hesitant to change things too much
> right now and possibly break something somewhere.  How about doing it later?
>
I believe there is a decent chance of regressing on some platforms, so
doing it as a follow up sounds like a nice thing.

-Emil