Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit58a031f

Browse files
committed
Make configure probe for mbstowcs_l as well as wcstombs_l.
We previously supposed that any given platform would supply both or neitherof these functions, so that one configure test would be sufficient. It nowappears that at least on AIX this is not the case ... which is likely anAIX bug, but nonetheless we need to cope with it. So use separate tests.Per bug #6758; thanks to Andrew Hastie for doing the followup testingneeded to confirm what was happening.Backpatch to 9.1, where we began using these functions.
1 parentfe811ae commit58a031f

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

‎configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19244,7 +19244,8 @@ fi
1924419244

1924519245

1924619246

19247-
for ac_func in cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit memmove poll pstat readlink setproctitle setsid sigprocmask symlink sync_file_range towlower utime utimes wcstombs wcstombs_l
19247+
19248+
for ac_func in cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll pstat readlink setproctitle setsid sigprocmask symlink sync_file_range towlower utime utimes wcstombs wcstombs_l
1924819249
do
1924919250
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1925019251
{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

‎configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1200,7 +1200,7 @@ PGAC_VAR_INT_TIMEZONE
12001200
AC_FUNC_ACCEPT_ARGTYPES
12011201
PGAC_FUNC_GETTIMEOFDAY_1ARG
12021202

1203-
AC_CHECK_FUNCS([cbrt dlopen fdatasync getifaddrs getpeerucred getrlimit memmove poll pstat readlink setproctitle setsid sigprocmask symlink sync_file_range towlower utime utimes wcstombs wcstombs_l])
1203+
AC_CHECK_FUNCS([cbrt dlopen fdatasync getifaddrs getpeerucred getrlimitmbstowcs_lmemmove poll pstat readlink setproctitle setsid sigprocmask symlink sync_file_range towlower utime utimes wcstombs wcstombs_l])
12041204

12051205
AC_REPLACE_FUNCS(fseeko)
12061206
case $host_os in

‎src/backend/utils/adt/pg_locale.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,17 +1206,17 @@ char2wchar(wchar_t *to, size_t tolen, const char *from, size_t fromlen,
12061206
else
12071207
{
12081208
#ifdefHAVE_LOCALE_T
1209-
#ifdefHAVE_WCSTOMBS_L
1209+
#ifdefHAVE_MBSTOWCS_L
12101210
/* Use mbstowcs_l for nondefault locales */
12111211
result=mbstowcs_l(to,str,tolen,locale);
1212-
#else/* !HAVE_WCSTOMBS_L */
1212+
#else/* !HAVE_MBSTOWCS_L */
12131213
/* We have to temporarily set the locale as current ... ugh */
12141214
locale_tsave_locale=uselocale(locale);
12151215

12161216
result=mbstowcs(to,str,tolen);
12171217

12181218
uselocale(save_locale);
1219-
#endif/*HAVE_WCSTOMBS_L */
1219+
#endif/*HAVE_MBSTOWCS_L */
12201220
#else/* !HAVE_LOCALE_T */
12211221
/* Can't have locale != 0 without HAVE_LOCALE_T */
12221222
elog(ERROR,"mbstowcs_l is not available");

‎src/include/pg_config.h.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,9 @@
333333
/* Define to 1 if `long long int' works and is 64 bits. */
334334
#undef HAVE_LONG_LONG_INT_64
335335

336+
/* Define to 1 if you have the `mbstowcs_l' function. */
337+
#undef HAVE_MBSTOWCS_L
338+
336339
/* Define to 1 if you have the `memmove' function. */
337340
#undef HAVE_MEMMOVE
338341

‎src/include/pg_config.h.win32

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,9 @@
249249
#define HAVE_LONG_LONG_INT_64
250250
#endif
251251

252+
/* Define to 1 if you have the `mbstowcs_l' function. */
253+
#define HAVE_MBSTOWCS_L 1
254+
252255
/* Define to 1 if you have the `memmove' function. */
253256
#define HAVE_MEMMOVE 1
254257

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp