Commit64c8635

committed

On Win32, libintl replaces snprintf() with its own version that

understands arg control, so we don't need our own. In fact, italso uses macros that conflict with ours, so we _can't_ useour own.

1 parent160ca10 commit64c8635Copy full SHA for 64c8635

File tree

+15

-3

lines changed

+15

-3

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14706,7 +14706,13 @@ fi`
`14706`	`14706`
`14707`	`14707`	`# Force use of our snprintf if system's doesn't do arg control`
`14708`	`14708`	`# This feature is used by NLS`
`14709`		`-if test "$enable_nls" = yes && test $pgac_need_repl_snprintf = no; then`
	`14709`	`+if test "$enable_nls" = yes &&`
	`14710`	`+ test $pgac_need_repl_snprintf = no &&`
	`14711`	`+# On Win32, libintl replaces snprintf() with its own version that`
	`14712`	`+# understands arg control, so we don't need our own. In fact, it`
	`14713`	`+# also uses macros that conflict with ours, so we _can't_ use`
	`14714`	`+# our own.`
	`14715`	`+ test "$PORTNAME" != "win32"; then`
`14710`	`14716`	`echo "$as_me:$LINENO: checking whether printf supports argument control" >&5`
`14711`	`14717`	`echo $ECHO_N "checking whether printf supports argument control... $ECHO_C" >&6`
`14712`	`14718`	`if test "${pgac_cv_printf_arg_control+set}" = set; then`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dnl Process this file with autoconf to produce a configure script.`
`2`		`-dnl $PostgreSQL: pgsql/configure.in,v 1.408 2005/05/0511:50:18 neilc Exp $`
	`2`	`+dnl $PostgreSQL: pgsql/configure.in,v 1.409 2005/05/0519:15:54 momjian Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -1095,7 +1095,13 @@ AC_MSG_ERROR([[`
`1095`	`1095`
`1096`	`1096`	`# Force use of our snprintf if system's doesn't do arg control`
`1097`	`1097`	`# This feature is used by NLS`
`1098`		`-if test "$enable_nls" = yes && test $pgac_need_repl_snprintf = no; then`
	`1098`	`+if test "$enable_nls" = yes &&`
	`1099`	`+ test $pgac_need_repl_snprintf = no &&`
	`1100`	`+# On Win32, libintl replaces snprintf() with its own version that`
	`1101`	`+# understands arg control, so we don't need our own. In fact, it`
	`1102`	`+# also uses macros that conflict with ours, so we _can't_ use`
	`1103`	`+# our own.`
	`1104`	`+ test "$PORTNAME" != "win32"; then`
`1099`	`1105`	`PGAC_FUNC_PRINTF_ARG_CONTROL`
`1100`	`1106`	`if test $pgac_cv_printf_arg_control != yes ; then`
`1101`	`1107`	`pgac_need_repl_snprintf=yes`

Comments

(0)