Try to avoid clashing symbols.

[gnulib.git] / lib / isapipe.c

diff --git a/lib/isapipe.c b/lib/isapipe.c
index 02c1171..83a9bf2 100644 (file)
--- a/lib/isapipe.c
+++ b/lib/isapipe.c
@@ -28,13 +28,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "stat-macros.h"
-
-/* Whether pipes are FIFOs; -1 if not known.  */
-#ifndef HAVE_FIFO_PIPES
-# define HAVE_FIFO_PIPES (-1)
-#endif
-
 /* The maximum link count for pipes; (nlink_t) -1 if not known.  */
 #ifndef PIPE_LINK_COUNT_MAX
 # define PIPE_LINK_COUNT_MAX ((nlink_t) (-1))
@@ -71,17 +64,17 @@ isapipe (int fd)
         && PIPE_LINK_COUNT_MAX != (nlink_t) -1)
       && (S_ISFIFO (st.st_mode) | S_ISSOCK (st.st_mode)))
     {
-      int fd[2];
-      int pipe_result = pipe (fd);
+      int fd_pair[2];
+      int pipe_result = pipe (fd_pair);
       if (pipe_result != 0)
        return pipe_result;
       else
        {
          struct stat pipe_st;
-         int fstat_pipe_result = fstat (fd[0], &pipe_st);
+         int fstat_pipe_result = fstat (fd_pair[0], &pipe_st);
          int fstat_pipe_errno = errno;
-         close (fd[0]);
-         close (fd[1]);
+         close (fd_pair[0]);
+         close (fd_pair[1]);
          if (fstat_pipe_result != 0)
            {
              errno = fstat_pipe_errno;