httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r779791 - /httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h
Date Thu, 28 May 2009 23:02:49 GMT
Author: wrowe
Date: Thu May 28 23:02:49 2009
New Revision: 779791

URL: http://svn.apache.org/viewvc?rev=779791&view=rev
Log:
Clean up internal includes

Modified:
    httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h

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=779791&r1=779790&r2=779791&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h Thu May 28 23:02:49 2009
@@ -25,7 +25,6 @@
 
 #include "mod_ftp.h"
 
-#ifdef FTP_BUILD
 #ifdef FTP_APXS_BUILD
 /* Not defined on Win32/Netware since #undef's aren't really needed */
 #include "ftp_config.h"
@@ -33,7 +32,6 @@
 #ifndef CORE_PRIVATE
 #define CORE_PRIVATE
 #endif
-#endif /* FTP_BUILD */
 
 /* FTP header has a couple of defines... on win32
    rather than including it, we'll just hack em in
@@ -47,9 +45,21 @@
 #endif
 
 /* Apache headers */
-#include "apr_buckets.h"
+#include "http_log.h"
+#include "http_main.h"
+#include "http_core.h"
+#include "http_connection.h"
+#include "http_request.h"
+#include "http_protocol.h"
+
+#include "ap_config.h"
+#include "ap_mmn.h"
+
 #include "util_filter.h"
 #include "util_ebcdic.h"
+#include "scoreboard.h"
+
+#include "apr_buckets.h"
 #include "apr_strings.h"
 #include "apr_hooks.h"
 #include "apr_hash.h"
@@ -57,34 +67,21 @@
 #include "apr_lib.h"
 #include "apr_inherit.h"
 #include "apr_poll.h"
-#include "ap_config.h"
-#include "ap_mmn.h"
-#include "http_config.h"
-#include "http_log.h"
-#include "http_main.h"
-#include "http_core.h"
-#include "http_connection.h"
-#include "http_request.h"
-#include "http_protocol.h"
-#include "scoreboard.h"
 
-#ifdef FTP_BUILD
 #ifdef FTP_APXS_BUILD
 #include "mod_log_config.h"
 #else
 #include "../../modules/loggers/mod_log_config.h"
 #endif
-#endif
 
 #if APR_HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#if HAVE_SYS_STAT_H
+#if APR_HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 
-
 /* SSL Filter name */
 #define FTP_SSL_FILTER        "SSL/TLS Filter"
 



Mime
View raw message