* configure.in: added Cygwin specific APR_SETVARs.

  * os/config.m4: added Cygwin specific values for $OS and $OS_DIR.
    $OS_DIR will change to "cygwin" as soon as I get the DSO/DLL things
    clean as with 1.3.20.

  * support/logresolve.c: added OS specific #ifdef statement to define
    h_errno as extern __declspec(dllimport); it's imported from the
    cygwin1.dll itself.

Submitted by: Stipe Tolj <tolj@wapme-systems.de>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90805 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 0c7451aa1d3a3fb88d47b1742f82b7896c559ac6..2a1022c2b9b9077ea0eb8b7ad052a3b075e068ac 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
 Changes with Apache 2.0.26-dev
 
+  *) Some initial support for the cygwin platform [prefork only].
+     This is not to be confused with support for the WinNT/Win32
+     platform, which is the recommended configuration for native
+     Win32 users.  The cygwin platform support is recommended for
+     cygwin platform users. [Stipe Tolj <tolj@wapme-systems.de>]
+
   *) Changed syntax of Set{Input|Output}Filter.  The list of filters
      must be semicolon delimited (if more than one filter is given.)
      The Set{Input|Output}Filter directive now overrides a parent

diff --git a/configure.in b/configure.in
index a7846e47908626baac2fbc1b02b9defa7fd81263..19027d4fcf3539a01e347e51c7dedda9fd66122d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -157,6 +157,10 @@ case $host in
       dnl  This is a hack -- we should be using AC_TRY_RUN instead
       ap_platform_runtime_link_flag="-R"
       ;;
+  *cygwin*)
+      APR_SETVAR(APACHE_MPM, [prefork])
+      APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
+      ;;
 esac
 
 dnl

diff --git a/os/config.m4 b/os/config.m4
index 669c0bd67aed783f1dba65fe544796216c5bcafd..704204360f84ecb3d195f8104d08c2a66f595775 100644 (file)
--- a/os/config.m4
+++ b/os/config.m4
@@ -13,6 +13,10 @@ bs2000*)
   OS="unix"
   OS_DIR=bs2000  # only the OS_DIR is platform specific.
   ;;
+*cygwin*)
+  OS="cygwin"
+  OS_DIR="unix"
+  ;;
 *)
   OS="unix"
   OS_DIR=$OS;;

diff --git a/support/logresolve.c b/support/logresolve.c
index 237e091b2cefd5e57acdda2f1234873d0c19a712..197181449a5b0f21309a1381d04bfa6e0a6eafb8 100644 (file)
--- a/support/logresolve.c
+++ b/support/logresolve.c
@@ -117,8 +117,12 @@ struct nsrec {
  */
 
 #ifndef h_errno
+#ifdef __CYGWIN__
+extern __declspec(dllimport) int h_errno;
+#else
 extern int h_errno; /* some machines don't have this in their headers */
 #endif
+#endif
 
 /* largest value for h_errno */