[myserver-commit] [SCM] GNU MyServer branch, master, updated. 843ef0e7e6be88f16260d5eca58c4e0a75acc57e

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  843ef0e7e6be88f16260d5eca58c4e0a75acc57e (commit)
      from  4538ac18536a8cab0791e771100dee0735fbfb24 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 843ef0e7e6be88f16260d5eca58c4e0a75acc57e
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Oct 24 02:06:14 2009 +0200

    Use two new gnulib modules: `pipe' and `gettimeofday'.

diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index 6ba7214..ec489e4 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -24,11 +24,13 @@ SKIP_PO=t
 # gnulib modules used by this package.
 gnulib_modules="
 chdir-long
-gettext
 crypto/md5
+getcwd
+gettext
+gettimeofday
 nproc
+pipe
 regex
-getcwd
 snprintf
 "
 
diff --git a/myserver/configure.ac b/myserver/configure.ac
index abcf3b0..1d5c6af 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -87,7 +87,7 @@ AC_CHECK_HEADER([sys/sendfile.h], AC_DEFINE(SENDFILE, 1,
 
 gl_INIT
 
-AC_CHECK_FUNCS(regcomp gettimeofday setgroups localtime_r pipe posix_fallocate 
\
+AC_CHECK_FUNCS(regcomp setgroups localtime_r posix_fallocate \
                           openat fstatat getpwnam ffsl readdir_r)
 
 AC_CHECK_LIB(gcrypt, gcry_control, AC_DEFINE(GCRY_CONTROL, 1,
diff --git a/myserver/src/base/pipe/pipe.cpp b/myserver/src/base/pipe/pipe.cpp
index 1ff9b51..8c0f342 100644
--- a/myserver/src/base/pipe/pipe.cpp
+++ b/myserver/src/base/pipe/pipe.cpp
@@ -97,13 +97,7 @@ int Pipe::read (char* buffer, u_long len, u_long *nbr)
 int Pipe::create (bool readPipe)
 {
 #ifndef WIN32
-
-# ifdef HAVE_PIPE
   return pipe (handles);
-# else
-  return 1;
-# endif
-
 #else
   HANDLE tmp;
   SECURITY_ATTRIBUTES sa;
@@ -308,7 +302,7 @@ int Pipe::waitForData (int sec, int usec)
 
   return 0;
 
-#elif HAVE_PIPE
+#else
   struct timeval tv;
   fd_set readfds;
   int ret;

-----------------------------------------------------------------------

Summary of changes:
 myserver/bootstrap.conf         |    6 ++++--
 myserver/configure.ac           |    2 +-
 myserver/src/base/pipe/pipe.cpp |    8 +-------
 3 files changed, 6 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU MyServer