You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/12/08 12:18:46 UTC
svn commit: r1718567 - /subversion/trunk/subversion/mod_dav_svn/status.c
Author: rhuijben
Date: Tue Dec 8 11:18:46 2015
New Revision: 1718567
URL: http://svn.apache.org/viewvc?rev=1718567&view=rev
Log:
* subversion/mod_dav_svn/status.c
(includes): Include <process.h> if available.
(dav_svn__status): Produce process-id on Windows.
Modified:
subversion/trunk/subversion/mod_dav_svn/status.c
Modified: subversion/trunk/subversion/mod_dav_svn/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/status.c?rev=1718567&r1=1718566&r2=1718567&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/status.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/status.c Tue Dec 8 11:18:46 2015
@@ -33,6 +33,10 @@
#include <unistd.h> /* For getpid() */
#endif
+#if APR_HAVE_PROCESS_H
+#include <process.h>
+#endif
+
/* The apache headers define these and they conflict with our definitions. */
#ifdef PACKAGE_BUGREPORT
#undef PACKAGE_BUGREPORT
@@ -94,7 +98,7 @@ int dav_svn__status(request_rec *r)
ap_ht_time(r->pool, apr_time_now(), DEFAULT_TIME_FORMAT, 0),
"</dt>\n", SVN_VA_NULL);
-#if !defined(WIN32) && defined(HAVE_UNISTD_H) && defined(HAVE_GETPID)
+#if defined(WIN32) || (defined(HAVE_UNISTD_H) && defined(HAVE_GETPID))
/* On Unix the server is generally multiple processes and this
request only shows the status of the single process that handles
the request. Ideally we would iterate over all processes but that