bootstrap broken: nan() does not match prototype

[Paolo Carlini]

Kaveh R. Ghazi wrote:

>While this works around the bootstrap problem, I'm not sure whether
>the builtin conflict issue described in the PR is something that still
>needs to be addressed in the C frontend and we're just side stepping
>it.  So I'll leave the PR open and let someone else decide whether we
>can close it or not.
>  
>
Agreed.

>Ok for mainline and 3.4?
>  
>
OK.

Thanks!
Paolo.