httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r816074 - in /httpd/mod_ftp/trunk/modules/ftp: ftp_commands.c ftp_internal.h ftp_util.c
Date Thu, 17 Sep 2009 07:00:25 GMT
Author: rjung
Date: Thu Sep 17 07:00:24 2009
New Revision: 816074

URL: http://svn.apache.org/viewvc?rev=816074&view=rev
Log:
Revert r816061 and instead follow along the lines
of r782531.

APR currentyl doesn't correctly define APR_HAVE_SYS_STAT_H.
So fall back to HAVE_SYS_STAT_H as a second option.

Modified:
    httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h
    httpd/mod_ftp/trunk/modules/ftp/ftp_util.c

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c?rev=816074&r1=816073&r2=816074&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Thu Sep 17 07:00:24 2009
@@ -32,12 +32,6 @@
 #include <limits.h>
 #endif
 
-#ifdef HAVE_FCHMOD
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#endif
-
 /* Wish APR had one of these */
 #if defined(WIN32) || defined(USE_WINSOCK)
 #define FTP_APR_EADDRINUSE (APR_OS_START_SYSERR + WSAEADDRINUSE)

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h?rev=816074&r1=816073&r2=816074&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h Thu Sep 17 07:00:24 2009
@@ -84,6 +84,8 @@
 
 #if APR_HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#elif HAVE_SYS_STAT_H
+#include <sys/stat.h>
 #endif
 
 /* SSL Filter name */

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_util.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_util.c?rev=816074&r1=816073&r2=816074&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_util.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_util.c Thu Sep 17 07:00:24 2009
@@ -25,12 +25,6 @@
 #include "apr_fnmatch.h"
 #include "ap_mpm.h"             /* For MPM query interface */
 
-#ifndef WIN32
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#endif
-
 /* Warning; the *arg is consumed, manipulated and must have the same lifetime
  * as the desired *addr results!
  */



Mime
View raw message