Re: VS 2015 support in src/tools/msvc

On 04/29/2016 12:39 AM, Tom Lane wrote:
> Andrew Dunstan <andrew@dunslane.net> writes:
>> latest patch attached. I have also cleaned up the docs some, and removed
>> references to the now redundant msysGit.
> Please don't do stuff like this:
>
> @@ -232,6 +265,10 @@ win32_langinfo(const char *ctype)
>           if (r != NULL)
>               sprintf(r, "CP%s", codepage);
>       }
> +
> +#if (_MSC_VER >= 1900)
> +    }
> +#endif
>   #endif
>   
>       return r;
>
> I'm not very sure what pgindent will do with conditionally-included
> indentation, but it's unlikely to be pleasing.
>
> In this particular case, you could probably fix it by making the
> other end of that be
>
> +    if (GetLocaleInfoEx(wctype,
> +            LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER,
> +            (LPWSTR) &cp, sizeof(cp) / sizeof(WCHAR)) > 0)
> +    {
> +        r = malloc(16);            /* excess */
> +        if (r != NULL)
> +            sprintf(r, "CP%u", cp);
> +    }
> +    else
> +#endif
> +    {
> +
>
> and omitting the #if/#endif around the trailing }.
>
>             



Yeah, I noticed the ugliness, should have fixed it. Applied your fix and 
committed.

cheers

andrew