Re: Bug 61407 - Build errors on latest OS X 10.10 Yosemite with Xcode 6 on GCC 4.8.3

["Bernhard Reutner-Fischer" <rep dot dot dot nop at gmail dot com>]

On 17 June 2014 13:10:07 ÐÐÑÑ ÐÐÑÐÐÑÑÐÐ <morpheby@gmail.com> wrote:

> index 892ba35..39f795f 100644
> --- a/gcc/config/darwin-c.c
> +++ b/gcc/config/darwin-c.c
> @@ -572,20 +572,31 @@ find_subframework_header (cpp_reader *pfile, const 
> char *header, cpp_dir **dirp)
>
>  /* Return the value of darwin_macosx_version_min suitable for the
>     __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro,
> -   so '10.4.2' becomes 1040.  The lowest digit is always zero.
> -   Print a warning if the version number can't be understood.  */
> +   so '10.4.2' becomes 1040 and '10.10.0' becomes 101000.  The lowest
> +   digit is always zero. Print a warning if the version number
> +   can't be understood.  */
>  static const char *
>  version_as_macro (void)
>  {
> -  static char result[] = "1000";
> +  static char result[7] = "1000";
> +  int minorDigitIdx;
>
>    if (strncmp (darwin_macosx_version_min, "10.", 3) != 0)
>      goto fail;
>    if (! ISDIGIT (darwin_macosx_version_min[3]))
>      goto fail;
> -  result[2] = darwin_macosx_version_min[3];
> -  if (darwin_macosx_version_min[4] != '\0'
> -      && darwin_macosx_version_min[4] != '.')
> +
> +  minorDigitIdx = 3;
> +  result[2] = darwin_macosx_version_min[minorDigitIdx++];
> +  if (ISDIGIT(darwin_macosx_version_min[minorDigitIdx])) {
> +    /* Starting with 10.10 numeration for mactro changed */

What does "mactro" mean? macro?
Thanks,


Sent with AquaMail for Android
http://www.aqua-mail.com