diff options
| author | Noah Misch <noah@leadboat.com> | 2014-11-02 21:43:20 -0500 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2014-11-02 21:44:34 -0500 |
| commit | c55dd5dc79b300d52ee452be7687e4c14d573c02 (patch) | |
| tree | c73a29f7888cb4d92d7c4e38b85c9d5b5daea55d | |
| parent | 615f6790d8fac2920eb88a6458768796e45a1020 (diff) | |
| download | postgresql-c55dd5dc79b300d52ee452be7687e4c14d573c02.tar.gz postgresql-c55dd5dc79b300d52ee452be7687e4c14d573c02.zip | |
Fix win32setlocale.c const-related warnings.
Back-patch to 9.2, like commit db29620d4d16e08241f965ccd70d0f65883ff0de.
| -rw-r--r-- | src/port/win32setlocale.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/port/win32setlocale.c b/src/port/win32setlocale.c index e1ee6e52713..a04e30125ad 100644 --- a/src/port/win32setlocale.c +++ b/src/port/win32setlocale.c @@ -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; } |