httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r604385 - in /httpd/mod_ftp/trunk: include/ modules/ftp/
Date Sat, 15 Dec 2007 03:38:12 GMT
Author: wrowe
Date: Fri Dec 14 19:38:11 2007
New Revision: 604385

URL: http://svn.apache.org/viewvc?rev=604385&view=rev
Log:
Refactor ftp_config out of win32, and out of unix in-tree builds.

FTP_APXS_BUILD is hiding in Makefile.apxs, and won't otherwise
be defined.

Modified:
    httpd/mod_ftp/trunk/include/mod_ftp.h
    httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_log.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_message.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_request.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_util.c
    httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c

Modified: httpd/mod_ftp/trunk/include/mod_ftp.h
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/include/mod_ftp.h?rev=604385&r1=604384&r2=604385&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/include/mod_ftp.h (original)
+++ httpd/mod_ftp/trunk/include/mod_ftp.h Fri Dec 14 19:38:11 2007
@@ -23,6 +23,16 @@
 #ifndef MOD_FTP_H
 #define 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"
+#endif
+#ifndef CORE_PRIVATE
+#define CORE_PRIVATE
+#endif
+#endif /* FTP_BUILD */
+
 #define MODFTP_VERSION "0.9.0-dev"
 
 /* FTP header has a couple of defines... on win32
@@ -34,10 +44,6 @@
 #else
 #define	TYPE_A		1	/* ASCII */
 #define	TYPE_I		3	/* image */
-#endif
-
-#ifndef CORE_PRIVATE
-#define CORE_PRIVATE
 #endif
 
 /* Apache headers */

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=604385&r1=604384&r2=604385&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Fri Dec 14 19:38:11 2007
@@ -20,7 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
-#include "ftp_config.h"
+#define FTP_BUILD
 #include "mod_ftp.h"
 #include "apr_version.h"
 #include "apr_network_io.h"

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c?rev=604385&r1=604384&r2=604385&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c Fri Dec 14 19:38:11 2007
@@ -20,7 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
-#include "ftp_config.h"
+#define FTP_BUILD
 #include "mod_ftp.h"
 
 /*

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c?rev=604385&r1=604384&r2=604385&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c Fri Dec 14 19:38:11 2007
@@ -20,7 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
-#include "ftp_config.h"
+#define FTP_BUILD
 #include "mod_ftp.h"
 
 /*

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c?rev=604385&r1=604384&r2=604385&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c Fri Dec 14 19:38:11 2007
@@ -20,7 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
-#include "ftp_config.h"
+#define FTP_BUILD
 #include "mod_ftp.h"
 
 /* Reimplement the core i/o filters to insert two-channel

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c?rev=604385&r1=604384&r2=604385&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c Fri Dec 14 19:38:11 2007
@@ -20,7 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
-#include "ftp_config.h"
+#define FTP_BUILD
 #include "mod_ftp.h"
 
 /* ftp_crlf_filter: Filter for sending ASCII files.  RFC 959 states that

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c?rev=604385&r1=604384&r2=604385&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c Fri Dec 14 19:38:11 2007
@@ -14,7 +14,7 @@
  * SOFTWARE.
  */
 
-#include "ftp_config.h"
+#define FTP_BUILD
 #include "mod_ftp.h"
 #include "apr_network_io.h"
 

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c?rev=604385&r1=604384&r2=604385&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c Fri Dec 14 19:38:11 2007
@@ -20,8 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
-
-#include "ftp_config.h"
+#define FTP_BUILD
 #include "mod_ftp.h"
 
 #include "ap_mpm.h" /* For MPM query interface */

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_log.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_log.c?rev=604385&r1=604384&r2=604385&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_log.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_log.c Fri Dec 14 19:38:11 2007
@@ -20,7 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
  
-#include "ftp_config.h"
+#define FTP_BUILD
 #include "mod_ftp.h"
 
 /*

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_message.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_message.c?rev=604385&r1=604384&r2=604385&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_message.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_message.c Fri Dec 14 19:38:11 2007
@@ -20,7 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
-#include "ftp_config.h"
+#define FTP_BUILD
 #include "mod_ftp.h"
 
 /* ftp_message_generate: Function to transform meta-characters

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c?rev=604385&r1=604384&r2=604385&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c Fri Dec 14 19:38:11 2007
@@ -20,7 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
-#include "ftp_config.h"
+#define FTP_BUILD
 #include "mod_ftp.h"
 
 /* Min # of bytes to allocate when reading a request line */

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_request.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_request.c?rev=604385&r1=604384&r2=604385&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_request.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_request.c Fri Dec 14 19:38:11 2007
@@ -20,7 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
-#include "ftp_config.h"
+#define FTP_BUILD
 #include "mod_ftp.h"
 
 #ifndef apr_time_from_sec

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=604385&r1=604384&r2=604385&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_util.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_util.c Fri Dec 14 19:38:11 2007
@@ -20,8 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
-
-#include "ftp_config.h"
+#define FTP_BUILD
 #include "mod_ftp.h"
 #include "apr_fnmatch.h"
 #include "ap_mpm.h" /* For MPM query interface */

Modified: httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c?rev=604385&r1=604384&r2=604385&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c Fri Dec 14 19:38:11 2007
@@ -20,7 +20,7 @@
  * FTP Protocol module for Apache 2.0
  */
 
-#include "ftp_config.h"
+#define FTP_BUILD
 #include "mod_ftp.h"
 
 #define FTP_SERVER_STRING "mod_ftp/" MODFTP_VERSION



Mime
View raw message