NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commite71d09a

committed

Clean up printf arg-control test, per Kurt Roeckx.

1 parent4199414 commite71d09aCopy full SHA for e71d09a

File tree

2 files changed

+17

-21

lines changed

config
- c-library.m4
configure

2 files changed

+17

-21

lines changed

`‎config/c-library.m4`

Lines changed: 9 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# Macros that test various C library quirks`
`2`		`-# $PostgreSQL: pgsql/config/c-library.m4,v 1.30 2005/02/22 03:55:50 momjian Exp $`
	`2`	`+# $PostgreSQL: pgsql/config/c-library.m4,v 1.31 2005/02/24 01:34:45 tgl Exp $`
`3`	`3`
`4`	`4`
`5`	`5`	`# PGAC_VAR_INT_TIMEZONE`
`@@ -273,25 +273,23 @@ esac])# PGAC_FUNC_SNPRINTF_LONG_LONG_INT_FORMAT`
`273`	`273`	`# Determine if printf supports %1$ argument selection, e.g. %5$ selects`
`274`	`274`	`# the fifth argument after the printf print string.`
`275`	`275`	`# This is not in the C99 standard, but in the Single Unix Specification (SUS).`
`276`		`-# It is used in ourlangauge translation strings.`
	`276`	`+# It is used in ourlanguage translation strings.`
`277`	`277`	`#`
`278`	`278`	`AC_DEFUN([PGAC_FUNC_PRINTF_ARG_CONTROL],`
`279`		`-[AC_MSG_CHECKING([printf supports argument control])`
	`279`	`+[AC_MSG_CHECKING([whetherprintf supports argument control])`
`280`	`280`	`AC_CACHE_VAL(pgac_cv_printf_arg_control,`
`281`	`281`	`[AC_TRY_RUN([#include <stdio.h>`
	`282`	`+#include <string.h>`
`282`	`283`
`283`		`-intdoes_printf_have_arg_control()`
	`284`	`+intmain()`
`284`	`285`	`{`
`285`	`286`	`char buf[100];`
`286`	`287`
`287`	`288`	`/* can it swap arguments? */`
`288`		`- snprintf(buf, 100, "%2$d\|%1$d", 3, 4);`
`289`		`- if (strcmp(buf, "4\|3") != 0)`
`290`		`- return 0;`
`291`		`- return 1;`
`292`		`-}`
`293`		`-main() {`
`294`		`- exit(! does_printf_have_arg_control());`
	`289`	`+ snprintf(buf, 100, "%2\$d %1\$d", 3, 4);`
	`290`	`+ if (strcmp(buf, "4 3") != 0)`
	`291`	`+ return 1;`
	`292`	`+ return 0;`
`295`	`293`	`}],`
`296`	`294`	`[pgac_cv_printf_arg_control=yes],`
`297`	`295`	`[pgac_cv_printf_arg_control=no],`

`‎configure`

Lines changed: 8 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -12162,8 +12162,8 @@ fi`
`12162`	`12162`	`done`
`12163`	`12163`
`12164`	`12164`
`12165`		`-echo "$as_me:$LINENO: checking printf supports argument control" >&5`
`12166`		`-echo $ECHO_N "checking printf supports argument control... $ECHO_C" >&6`
	`12165`	`+echo "$as_me:$LINENO: checkingwhetherprintf supports argument control" >&5`
	`12166`	`+echo $ECHO_N "checkingwhetherprintf supports argument control... $ECHO_C" >&6`
`12167`	`12167`	`if test "${pgac_cv_printf_arg_control+set}" = set; then`
`12168`	`12168`	`echo $ECHO_N "(cached) $ECHO_C" >&6`
`12169`	`12169`	`else`
`@@ -12174,19 +12174,17 @@ else`
`12174`	`12174`	`#line $LINENO "configure"`
`12175`	`12175`	`#include "confdefs.h"`
`12176`	`12176`	`#include <stdio.h>`
	`12177`	`+#include <string.h>`
`12177`	`12178`
`12178`		`-intdoes_printf_have_arg_control()`
	`12179`	`+intmain()`
`12179`	`12180`	`{`
`12180`	`12181`	`char buf[100];`
`12181`	`12182`
`12182`	`12183`	`/* can it swap arguments? */`
`12183`		`- snprintf(buf, 100, "%2$d\|%1$d", 3, 4);`
`12184`		`- if (strcmp(buf, "4\|3") != 0)`
`12185`		`- return 0;`
`12186`		`- return 1;`
`12187`		`-}`
`12188`		`-main() {`
`12189`		`- exit(! does_printf_have_arg_control());`
	`12184`	`+ snprintf(buf, 100, "%2\$d %1\$d", 3, 4);`
	`12185`	`+ if (strcmp(buf, "4 3") != 0)`
	`12186`	`+ return 1;`
	`12187`	`+ return 0;`
`12190`	`12188`	`}`
`12191`	`12189`	`_ACEOF`
`12192`	`12190`	`rm -f conftest$ac_exeext`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite71d09a

File tree

2 files changed

2 files changed

`‎config/c-library.m4`

`‎configure`

0 commit comments