aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--extension/ChangeLog5
-rw-r--r--extension/Makefile.am1
-rw-r--r--extension/Makefile.in1
-rw-r--r--io.c1
5 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f11b673..cc86c1c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2015-12-16 Arnold D. Robbins <arnold@skeeve.com>
+ * io.c (two_way_open): Remove unneeded close of slave in the
+ parent.
+
+2015-12-16 Arnold D. Robbins <arnold@skeeve.com>
+
* profile.c (pp_number): Move count into ifdef for MPFR. Avoids
an unused variable warning if not compiling for MPFR.
diff --git a/extension/ChangeLog b/extension/ChangeLog
index 65a419df..a700092d 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,5 +1,10 @@
2015-12-16 Arnold D. Robbins <arnold@skeeve.com>
+ * Makefile.am (EXTRA_DIST): Add ext_custom.h so that it will be
+ included in the distribution tarballs.
+
+2015-12-16 Arnold D. Robbins <arnold@skeeve.com>
+
Make change of 2015-10-26 actually work.
* ext_custom.h: New file. Move _DEFAULT_SOURCE dance to here.
diff --git a/extension/Makefile.am b/extension/Makefile.am
index ff9e9073..de0513b0 100644
--- a/extension/Makefile.am
+++ b/extension/Makefile.am
@@ -118,6 +118,7 @@ uninstall-recursive: uninstall-so
EXTRA_DIST = build-aux/config.rpath \
ChangeLog \
ChangeLog.0 \
+ ext_custom.h \
fts.3 \
README.fts \
rwarray0.c
diff --git a/extension/Makefile.in b/extension/Makefile.in
index 868781ca..629c5e6b 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -564,6 +564,7 @@ testext_la_LIBADD = $(MY_LIBS)
EXTRA_DIST = build-aux/config.rpath \
ChangeLog \
ChangeLog.0 \
+ ext_custom.h \
fts.3 \
README.fts \
rwarray0.c
diff --git a/io.c b/io.c
index fe234efb..9385a1e6 100644
--- a/io.c
+++ b/io.c
@@ -2060,7 +2060,6 @@ two_way_open(const char *str, struct redirect *rp, int extfd)
case -1:
save_errno = errno;
close(master);
- close(slave);
errno = save_errno;
return false;