Skip to content

Commit 4167c58

Browse files
kelvichkelvich
committed
Merge remote-tracking branch 'pg/master' into flushdata_osx
2 parents 833d481 + 326d73c commit 4167c58

File tree

174 files changed

+10115
-2211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+10115
-2211
lines changed

‎config/c-library.m4

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,4 +316,34 @@ fi
316316
if test "$pgac_cv_type_locale_t" = 'yes (in xlocale.h)'; then
317317
AC_DEFINE(LOCALE_T_IN_XLOCALE, 1,
318318
[Define to 1 if `locale_t' requires <xlocale.h>.])
319-
fi])])# PGAC_HEADER_XLOCALE
319+
fi])# PGAC_TYPE_LOCALE_T
320+
321+
322+
# PGAC_FUNC_WCSTOMBS_L
323+
# --------------------
324+
# Try to find a declaration for wcstombs_l(). It might be in stdlib.h
325+
# (following the POSIX requirement for wcstombs()), or in locale.h, or in
326+
# xlocale.h. If it's in the latter, define WCSTOMBS_L_IN_XLOCALE.
327+
#
328+
AC_DEFUN([PGAC_FUNC_WCSTOMBS_L],
329+
[AC_CACHE_CHECK([for wcstombs_l declaration], pgac_cv_func_wcstombs_l,
330+
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
331+
[#include <stdlib.h>
332+
#include <locale.h>],
333+
[#ifndef wcstombs_l
334+
(void) wcstombs_l;
335+
#endif])],
336+
[pgac_cv_func_wcstombs_l='yes'],
337+
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
338+
[#include <stdlib.h>
339+
#include <locale.h>
340+
#include <xlocale.h>],
341+
[#ifndef wcstombs_l
342+
(void) wcstombs_l;
343+
#endif])],
344+
[pgac_cv_func_wcstombs_l='yes (in xlocale.h)'],
345+
[pgac_cv_func_wcstombs_l='no'])])])
346+
if test "$pgac_cv_func_wcstombs_l" = 'yes (in xlocale.h)'; then
347+
AC_DEFINE(WCSTOMBS_L_IN_XLOCALE, 1,
348+
[Define to 1 if `wcstombs_l' requires <xlocale.h>.])
349+
fi])# PGAC_FUNC_WCSTOMBS_L

‎configure

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12364,6 +12364,59 @@ $as_echo "#define GETTIMEOFDAY_1ARG 1" >>confdefs.h
1236412364

1236512365
fi
1236612366

12367+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcstombs_l declaration" >&5
12368+
$as_echo_n "checking for wcstombs_l declaration... " >&6; }
12369+
if ${pgac_cv_func_wcstombs_l+:} false; then :
12370+
$as_echo_n "(cached) " >&6
12371+
else
12372+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12373+
/* end confdefs.h. */
12374+
#include <stdlib.h>
12375+
#include <locale.h>
12376+
int
12377+
main ()
12378+
{
12379+
#ifndef wcstombs_l
12380+
(void) wcstombs_l;
12381+
#endif
12382+
;
12383+
return 0;
12384+
}
12385+
_ACEOF
12386+
if ac_fn_c_try_compile "$LINENO"; then :
12387+
pgac_cv_func_wcstombs_l='yes'
12388+
else
12389+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12390+
/* end confdefs.h. */
12391+
#include <stdlib.h>
12392+
#include <locale.h>
12393+
#include <xlocale.h>
12394+
int
12395+
main ()
12396+
{
12397+
#ifndef wcstombs_l
12398+
(void) wcstombs_l;
12399+
#endif
12400+
;
12401+
return 0;
12402+
}
12403+
_ACEOF
12404+
if ac_fn_c_try_compile "$LINENO"; then :
12405+
pgac_cv_func_wcstombs_l='yes (in xlocale.h)'
12406+
else
12407+
pgac_cv_func_wcstombs_l='no'
12408+
fi
12409+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12410+
fi
12411+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12412+
fi
12413+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_func_wcstombs_l" >&5
12414+
$as_echo "$pgac_cv_func_wcstombs_l" >&6; }
12415+
if test "$pgac_cv_func_wcstombs_l" = 'yes (in xlocale.h)'; then
12416+
12417+
$as_echo "#define WCSTOMBS_L_IN_XLOCALE 1" >>confdefs.h
12418+
12419+
fi
1236712420

1236812421
# Some versions of libedit contain strlcpy(), setproctitle(), and other
1236912422
# symbols that that library has no business exposing to the world. Pending

‎configure.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1423,6 +1423,7 @@ fi
14231423
PGAC_VAR_INT_TIMEZONE
14241424
AC_FUNC_ACCEPT_ARGTYPES
14251425
PGAC_FUNC_GETTIMEOFDAY_1ARG
1426+
PGAC_FUNC_WCSTOMBS_L
14261427

14271428
# Some versions of libedit contain strlcpy(), setproctitle(), and other
14281429
# symbols that that library has no business exposing to the world. Pending

‎contrib/pg_trgm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ EXTENSION = pg_trgm
77
DATA = pg_trgm--1.2.sql pg_trgm--1.0--1.1.sql pg_trgm--1.1--1.2.sql pg_trgm--unpackaged--1.0.sql
88
PGFILEDESC = "pg_trgm - trigram matching"
99

10-
REGRESS = pg_trgm
10+
REGRESS = pg_trgm pg_word_trgm
1111

1212
ifdef USE_PGXS
1313
PG_CONFIG = pg_config

0 commit comments

Comments
 (0)