[Libreoffice-commits] .: Branch 'libreoffice-3-5' - dmake/configure.in dmake/unix

[Michael Meeks]

 dmake/configure.in   |    2 +-
 dmake/unix/runargv.c |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit baccf076f4a5a9986ad94f8477996fd44648b6d6
Author: Noel Power <noel.power at novell.com>
Date:   Tue Feb 21 15:13:08 2012 +0000

    Cope with more recent cygwin's process.h
    
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/dmake/configure.in b/dmake/configure.in
index c196413..d82c889 100755
--- a/dmake/configure.in
+++ b/dmake/configure.in
@@ -189,7 +189,7 @@ dnl Initialize libtool
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h)
+AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h cygwin/process.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c
index 4e87862..bd961a7 100644
--- a/dmake/unix/runargv.c
+++ b/dmake/unix/runargv.c
@@ -125,6 +125,9 @@ _finished_child(pid, status) [unix/runargv] handles the finished child. If
 #endif
 
 #if __CYGWIN__ && ENABLE_SPAWN
+#if HAVE_CYGWIN_PROCESS_H
+#  include <cygwin/process.h>
+#else
 #  include <process.h>
 #endif