database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-27 07:42:10 +03:00
Code Activity

Enable building with Microsoft Visual Studio 2012.

Browse Source 
Backpatch to release 9.2

Brar Piening and Noah Misch, reviewed by Craig Ringer.
This commit is contained in:
Andrew Dunstan
2013-02-06 14:52:29 -05:00
parent 5a1cd89f8f
commit e1c1e21732
11 changed files with 213 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/port/chklocale.c
View File

@@ -189,26 +189,49 @@ static const struct encoding_match encoding_match_list[] = {
#ifdef WIN32
/*
* On Windows, use CP<codepage number> instead of the nl_langinfo() result
* On Windows, use CP<code page number> instead of the nl_langinfo() result
*
* Visual Studio 2012 expanded the set of valid LC_CTYPE values, so have its
* locale machinery determine the code page. See comments at IsoLocaleName().
* For other compilers, follow the locale's predictable format.
*
* Returns a malloc()'d string for the caller to free.
*/
static char *
win32_langinfo(const char *ctype)
{
char *r;
char *r = NULL;
#if (_MSC_VER >= 1700)
_locale_t loct = NULL;
loct = _create_locale(LC_CTYPE, ctype);
if (loct != NULL)
{
r = malloc(16); /* excess */
if (r != NULL)
sprintf(r, "CP%u", loct->locinfo->lc_codepage);
_free_locale(loct);
}
#else
char *codepage;
int ln;
/*
* Locale format on Win32 is <Language>_<Country>.<CodePage> . For
* example, English_USA.1252.
* example, English_United States.1252.
*/
codepage = strrchr(ctype, '.');
if (!codepage)
return NULL;
codepage++;
ln = strlen(codepage);
r = malloc(ln + 3);
sprintf(r, "CP%s", codepage);
if (codepage != NULL)
{
int ln;
codepage++;
ln = strlen(codepage);
r = malloc(ln + 3);
if (r != NULL)
sprintf(r, "CP%s", codepage);
}
#endif
return r;
}