rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix win32setlocale.c const-related warnings. 

Back-patch to 9.2, like commit db29620d4d.
This commit is contained in:
Noah Misch 2014-11-02 21:43:20 -05:00
parent 9522efdae1
commit 8463195217
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/port/win32setlocale.c
View File

@ -103,8 +103,8 @@ static const struct locale_map locale_map_result[] = {
#define MAX_LOCALE_NAME_LEN 100
static char *
map_locale(struct locale_map *map, char *locale)
static const char *
map_locale(const struct locale_map *map, const char *locale)
{
static char aliasbuf[MAX_LOCALE_NAME_LEN];
int i;
@ -167,7 +167,7 @@ map_locale(struct locale_map *map, char *locale)
char *
pgwin32_setlocale(int category, const char *locale)
{
char *argument;
const char *argument;
char *result;
if (locale == NULL)
@ -178,8 +178,12 @@ pgwin32_setlocale(int category, const char *locale)
/* Call the real setlocale() function */
result = setlocale(category, argument);
/*
* setlocale() is specified to return a "char *" that the caller is
* forbidden to modify, so casting away the "const" is innocuous.
*/
if (result)
result = map_locale(locale_map_result, result);
result = (char *) map_locale(locale_map_result, result);
return result;
}