You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ph...@apache.org on 2015/10/20 11:30:20 UTC

svn commit: r1709553 - /subversion/trunk/subversion/mod_dav_svn/status.c

Author: philip
Date: Tue Oct 20 09:30:20 2015
New Revision: 1709553

URL: http://svn.apache.org/viewvc?rev=1709553&view=rev
Log:
* subversion/mod_dav_svn/status.c: Add missing include so that
   conditional code to show process ID gets enabled on Unix.

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=1709553&r1=1709552&r2=1709553&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/status.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/status.c Tue Oct 20 09:30:20 2015
@@ -29,6 +29,24 @@
 #include "private/svn_cache.h"
 #include "private/svn_fs_private.h"
 
+/* The apache headers define these and they conflict with our definitions. */
+#ifdef PACKAGE_BUGREPORT
+#undef PACKAGE_BUGREPORT
+#endif
+#ifdef PACKAGE_NAME
+#undef PACKAGE_NAME
+#endif
+#ifdef PACKAGE_STRING
+#undef PACKAGE_STRING
+#endif
+#ifdef PACKAGE_TARNAME
+#undef PACKAGE_TARNAME
+#endif
+#ifdef PACKAGE_VERSION
+#undef PACKAGE_VERSION
+#endif
+#include "svn_private_config.h"
+
 #ifndef DEFAULT_TIME_FORMAT
 #define DEFAULT_TIME_FORMAT "%Y-%m-%d %H:%M:%S %Z"
 #endif