diff options
Diffstat (limited to 'extension')
| -rw-r--r-- | extension/ChangeLog | 7 | ||||
| -rw-r--r-- | extension/configh.in | 4 | ||||
| -rwxr-xr-x | extension/configure | 3 | ||||
| -rw-r--r-- | extension/configure.ac | 2 | ||||
| -rw-r--r-- | extension/filefuncs.c | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index 62d1f310..4d2d69b8 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,10 @@ +2013-05-27 Arnold D. Robbins <arnold@skeeve.com> + + * configure.ac (AC_STRUCT_ST_BLKSIZE): Replaced with call to + AC_CHECK_MEMBERS. + * filefuncs.c (fill_stat_array): Change test from ifdef + HAVE_ST_BLKSIZE to HAVE_STRUCT_STAT_ST_BLKSIZE. + 2013-05-20 Arnold D. Robbins <arnold@skeeve.com> * gawkdirfd.h [FAKE_FD_VALUE]: Copied here from ../gawkapi.h. diff --git a/extension/configh.in b/extension/configh.in index cc84f4d0..ac8ad05f 100644 --- a/extension/configh.in +++ b/extension/configh.in @@ -90,10 +90,6 @@ /* Define to 1 if `st_blksize' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BLKSIZE -/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use - `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */ -#undef HAVE_ST_BLKSIZE - /* Define to 1 if you have the <sys/select.h> header file. */ #undef HAVE_SYS_SELECT_H diff --git a/extension/configure b/extension/configure index 23b050d3..26cde4b0 100755 --- a/extension/configure +++ b/extension/configure @@ -6447,12 +6447,9 @@ cat >>confdefs.h <<_ACEOF _ACEOF -$as_echo "#define HAVE_ST_BLKSIZE 1" >>confdefs.h - fi - if test -n "$ac_tool_prefix"; then for ac_prog in ar lib "link -lib" do diff --git a/extension/configure.ac b/extension/configure.ac index 40f29681..82742860 100644 --- a/extension/configure.ac +++ b/extension/configure.ac @@ -39,7 +39,7 @@ AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.18.1]) dnl checks for structure members -AC_STRUCT_ST_BLKSIZE +AC_CHECK_MEMBERS([struct stat.st_blksize]) AM_PROG_AR AC_SYS_LARGEFILE diff --git a/extension/filefuncs.c b/extension/filefuncs.c index 5117b32f..9d4b2258 100644 --- a/extension/filefuncs.c +++ b/extension/filefuncs.c @@ -351,11 +351,11 @@ fill_stat_array(const char *name, awk_array_t array, struct stat *sbuf) array_set_numeric(array, "minor", minor(sbuf->st_rdev)); } -#ifdef HAVE_ST_BLKSIZE +#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE array_set_numeric(array, "blksize", sbuf->st_blksize); #elif defined(_WIN32) array_set_numeric(array, "blksize", 4096); -#endif /* HAVE_ST_BLKSIZE */ +#endif /* HAVE_STRUCT_STAT_ST_BLKSIZE */ pmode = format_mode(sbuf->st_mode); array_set(array, "pmode", make_const_string(pmode, strlen(pmode), & tmp)); |