aboutsummaryrefslogtreecommitdiffstats
path: root/posix
diff options
context:
space:
mode:
authorJuergen Kahrs <Juergen.Kahrs@googlemail.com>2013-06-01 18:12:23 +0200
committerJuergen Kahrs <Juergen.Kahrs@googlemail.com>2013-06-01 18:12:23 +0200
commit37be8a17ee9e955dec8bbddb8cd2b31487e44a0c (patch)
treeaf9323636c991634144ddb5532d975f08ac56282 /posix
parent1a4fe61b7ad390740a0c70a0175b82301c083704 (diff)
parent5482bf19246965d6839fe9df1aec0785f0b1a329 (diff)
downloadegawk-37be8a17ee9e955dec8bbddb8cd2b31487e44a0c.tar.gz
egawk-37be8a17ee9e955dec8bbddb8cd2b31487e44a0c.tar.bz2
egawk-37be8a17ee9e955dec8bbddb8cd2b31487e44a0c.zip
Merge remote-tracking branch 'origin/master' into cmake
Diffstat (limited to 'posix')
-rw-r--r--posix/ChangeLog9
-rw-r--r--posix/gawkmisc.c9
2 files changed, 17 insertions, 1 deletions
diff --git a/posix/ChangeLog b/posix/ChangeLog
index 0f9cc0a0..443951c3 100644
--- a/posix/ChangeLog
+++ b/posix/ChangeLog
@@ -1,3 +1,12 @@
+2013-06-01 Eli Zaretskii <eliz@gnu.org>
+
+ * gawkmisc.c (init_sockets): New dummy function.
+
+2013-05-27 Arnold D. Robbins <arnold@skeeve.com>
+
+ * gawkmisc.c (optimal_bufsize): Change check from HAVE_ST_BLKSIZE
+ to HAVE_STRUCT_STAT_ST_BLKSIZE.
+
2013-05-09 Arnold D. Robbins <arnold@skeeve.com>
* 4.1.0: Release tar ball made.
diff --git a/posix/gawkmisc.c b/posix/gawkmisc.c
index 90bf1c38..c90123d2 100644
--- a/posix/gawkmisc.c
+++ b/posix/gawkmisc.c
@@ -127,7 +127,7 @@ optimal_bufsize(int fd, struct stat *stb)
* guess. We use stdio's BUFSIZ, since that is what it was
* meant for in the first place.
*/
-#ifdef HAVE_ST_BLKSIZE
+#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
#define DEFBLKSIZE (stb->st_blksize > 0 ? stb->st_blksize : BUFSIZ)
#else
#define DEFBLKSIZE BUFSIZ
@@ -285,6 +285,13 @@ files_are_same(char *path, SRCFILE *src)
&& st.st_ino == src->sbuf.st_ino);
}
+#ifdef HAVE_SOCKETS
+void
+init_sockets(void)
+{
+}
+#endif
+
#ifdef __CYGWIN__
void
cygwin_premain0(int argc, char **argv, struct per_process *myself)