pipe2: decouple from binary-io a bit

This is for Emacs, which needs pipe2 but not binary-io.
* lib/pipe2.c [!GNULIB_BINARY_IO]: Don't include binary-io.h.
* modules/binary-io (Depends-on): Add module indicator.

diff --git a/ChangeLog b/ChangeLog
index 692fbc3..f714711 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+       pipe2: decouple from binary-io a bit
+       This is for Emacs, which needs pipe2 but not binary-io.
+       * lib/pipe2.c [!GNULIB_BINARY_IO]: Don't include binary-io.h.
+       * modules/binary-io (Depends-on): Add module indicator.
+
 2013-07-03  Eric Blake  <eblake@redhat.com>
 
        mgetgroups: relax license to LGPLv2+

diff --git a/lib/pipe2.c b/lib/pipe2.c
index 3ab194e..9569073 100644 (file)
--- a/lib/pipe2.c
+++ b/lib/pipe2.c
@@ -22,7 +22,10 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "binary-io.h"
+#if GNULIB_BINARY_IO
+# include "binary-io.h"
+#endif
+
 #include "verify.h"
 
 #if GNULIB_defined_O_NONBLOCK

diff --git a/modules/binary-io b/modules/binary-io
index 4860252..1f646dc 100644 (file)
--- a/modules/binary-io
+++ b/modules/binary-io
@@ -10,6 +10,7 @@ extern-inline
 fcntl-h
 
 configure.ac:
+gl_MODULE_INDICATOR([binary-io])
 
 Makefile.am:
 lib_SOURCES += binary-io.h binary-io.c