Skip to content

P
Postgres FD Implementation
Commit e71d09a4 authored by Tom Lane's avatar Tom Lane
Browse files
Options

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

parent 41994145
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 21 deletions
config/c-library.m4
View file @ e71d09a4
# Macros that test various C library quirks # Macros that test various C library quirks
# $PostgreSQL: pgsql/config/c-library.m4,v 1.30 2005/02/22 03:55:50 momjian Exp $ # $PostgreSQL: pgsql/config/c-library.m4,v 1.31 2005/02/24 01:34:45 tgl Exp $
# PGAC_VAR_INT_TIMEZONE # PGAC_VAR_INT_TIMEZONE
...@@ -273,25 +273,23 @@ esac])# PGAC_FUNC_SNPRINTF_LONG_LONG_INT_FORMAT ...@@ -273,25 +273,23 @@ esac])# PGAC_FUNC_SNPRINTF_LONG_LONG_INT_FORMAT
# Determine if printf supports %1$ argument selection, e.g. %5$ selects # Determine if printf supports %1$ argument selection, e.g. %5$ selects
# the fifth argument after the printf print string. # the fifth argument after the printf print string.
# This is not in the C99 standard, but in the Single Unix Specification (SUS). # This is not in the C99 standard, but in the Single Unix Specification (SUS).
# It is used in our langauge translation strings. # It is used in our language translation strings.
# #
AC_DEFUN([PGAC_FUNC_PRINTF_ARG_CONTROL], AC_DEFUN([PGAC_FUNC_PRINTF_ARG_CONTROL],
[AC_MSG_CHECKING([printf supports argument control]) [AC_MSG_CHECKING([whether printf supports argument control])
AC_CACHE_VAL(pgac_cv_printf_arg_control, AC_CACHE_VAL(pgac_cv_printf_arg_control,
[AC_TRY_RUN([#include <stdio.h> [AC_TRY_RUN([#include <stdio.h>
#include <string.h>
int does_printf_have_arg_control() int main()
{ {
char buf[100]; char buf[100];
/* can it swap arguments? */ /* can it swap arguments? */
snprintf(buf, 100, "%2$d|%1$d", 3, 4); snprintf(buf, 100, "%2\$d %1\$d", 3, 4);
if (strcmp(buf, "4|3") != 0) if (strcmp(buf, "4 3") != 0)
return 0;
return 1; return 1;
} return 0;
main() {
exit(! does_printf_have_arg_control());
}], }],
[pgac_cv_printf_arg_control=yes], [pgac_cv_printf_arg_control=yes],
[pgac_cv_printf_arg_control=no], [pgac_cv_printf_arg_control=no],
......
configure
View file @ e71d09a4
...@@ -12162,8 +12162,8 @@ fi ...@@ -12162,8 +12162,8 @@ fi
done done
echo "$as_me:$LINENO: checking printf supports argument control" >&5 echo "$as_me:$LINENO: checking whether printf supports argument control" >&5
echo $ECHO_N "checking printf supports argument control... $ECHO_C" >&6 echo $ECHO_N "checking whether printf supports argument control... $ECHO_C" >&6
if test "${pgac_cv_printf_arg_control+set}" = set; then if test "${pgac_cv_printf_arg_control+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
...@@ -12174,19 +12174,17 @@ else ...@@ -12174,19 +12174,17 @@ else
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include <string.h>
int does_printf_have_arg_control() int main()
{ {
char buf[100]; char buf[100];
/* can it swap arguments? */ /* can it swap arguments? */
snprintf(buf, 100, "%2$d|%1$d", 3, 4); snprintf(buf, 100, "%2\$d %1\$d", 3, 4);
if (strcmp(buf, "4|3") != 0) if (strcmp(buf, "4 3") != 0)
return 0;
return 1; return 1;
} return 0;
main() {
exit(! does_printf_have_arg_control());
} }
_ACEOF _ACEOF
rm -f conftest$ac_exeext rm -f conftest$ac_exeext
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment