mod_fastcgi-SNAP-0910052141 doesn't compile against httpd-2.4.3; here's a patch. (eom)
Peter Danenberg <[email protected]> Fri, 16 Nov 2012 18:53:13 -0600
| Newsgroups | gmane.comp.web.fastcgi.devel |
|---|---|
| Message-ID | <[email protected]> |
--HcAYCG3uE/tztfnV Content-Type: text/plain; charset=us-ascii Content-Disposition: inline ----- Forwarded message from ----- Date: Sun, 11 Nov 2012 19:09:14 -0600 To: fastcgi-developers-xGejAJT2w6xVgU18Zptdi0EOCMrvLtNR@public.gmane.org Cc: [email protected], [email protected], [email protected] Subject: mod_fastcgi-SNAP-0910052141 doesn't compile against httpd-2.4.3; here's a patch. (eom) User-Agent: Mutt/1.5.21+52 (c26dbc7021f4) (2011-07-01) diff -Naur mod_fastcgi-SNAP-0910052141-orig/fcgi.h mod_fastcgi-SNAP-0910052141/fcgi.h --- mod_fastcgi-SNAP-0910052141-orig/fcgi.h 2012-11-11 16:55:39.274425161 -0800 +++ mod_fastcgi-SNAP-0910052141/fcgi.h 2012-11-11 16:58:36.914431603 -0800 @@ -57,10 +57,10 @@ #define XtOffsetOf APR_OFFSETOF #define ap_select select -#define ap_user_id unixd_config.user_id -#define ap_group_id unixd_config.group_id -#define ap_user_name unixd_config.user_name -#define ap_suexec_enabled unixd_config.suexec_enabled +#define ap_user_id ap_unixd_config.user_id +#define ap_group_id ap_unixd_config.group_id +#define ap_user_name ap_unixd_config.user_name +#define ap_suexec_enabled ap_unixd_config.suexec_enabled #ifndef S_ISDIR #define S_ISDIR(m) (((m)&(S_IFMT)) == (S_IFDIR)) @@ -354,82 +354,82 @@ #ifdef APACHE2 #ifdef WIN32 -#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError()) -#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError()) -#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError()) -#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError()) -#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError()) -#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError()) -#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError()) -#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError()) #else /* !WIN32 */ -#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) -#endif - -#define FCGI_LOG_EMERG_ERRNO __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_ALERT_ERRNO __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_CRIT_ERRNO __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_ERR_ERRNO __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_WARN_ERRNO __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_NOTICE_ERRNO __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_INFO_ERRNO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_DEBUG_ERRNO __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) - -#define FCGI_LOG_EMERG_NOERRNO __FILE__,__LINE__,APLOG_EMERG,0 -#define FCGI_LOG_ALERT_NOERRNO __FILE__,__LINE__,APLOG_ALERT,0 -#define FCGI_LOG_CRIT_NOERRNO __FILE__,__LINE__,APLOG_CRIT,0 -#define FCGI_LOG_ERR_NOERRNO __FILE__,__LINE__,APLOG_ERR,0 -#define FCGI_LOG_WARN_NOERRNO __FILE__,__LINE__,APLOG_WARNING,0 -#define FCGI_LOG_NOTICE_NOERRNO __FILE__,__LINE__,APLOG_NOTICE,0 -#define FCGI_LOG_INFO_NOERRNO __FILE__,__LINE__,APLOG_INFO,0 -#define FCGI_LOG_DEBUG_NOERRNO __FILE__,__LINE__,APLOG_DEBUG,0 +#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) +#endif + +#define FCGI_LOG_EMERG_ERRNO APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_ALERT_ERRNO APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_CRIT_ERRNO APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_ERR_ERRNO APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_WARN_ERRNO APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_NOTICE_ERRNO APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_INFO_ERRNO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_DEBUG_ERRNO APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) + +#define FCGI_LOG_EMERG_NOERRNO APLOG_MARK,APLOG_EMERG,0 +#define FCGI_LOG_ALERT_NOERRNO APLOG_MARK,APLOG_ALERT,0 +#define FCGI_LOG_CRIT_NOERRNO APLOG_MARK,APLOG_CRIT,0 +#define FCGI_LOG_ERR_NOERRNO APLOG_MARK,APLOG_ERR,0 +#define FCGI_LOG_WARN_NOERRNO APLOG_MARK,APLOG_WARNING,0 +#define FCGI_LOG_NOTICE_NOERRNO APLOG_MARK,APLOG_NOTICE,0 +#define FCGI_LOG_INFO_NOERRNO APLOG_MARK,APLOG_INFO,0 +#define FCGI_LOG_DEBUG_NOERRNO APLOG_MARK,APLOG_DEBUG,0 #else /* !APACHE2 */ #ifdef WIN32 -#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG|APLOG_WIN32ERROR -#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT|APLOG_WIN32ERROR -#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT|APLOG_WIN32ERROR -#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR|APLOG_WIN32ERROR -#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING|APLOG_WIN32ERROR -#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE|APLOG_WIN32ERROR -#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO|APLOG_WIN32ERROR -#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG|APLOG_WIN32ERROR +#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG|APLOG_WIN32ERROR +#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT|APLOG_WIN32ERROR +#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT|APLOG_WIN32ERROR +#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR|APLOG_WIN32ERROR +#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING|APLOG_WIN32ERROR +#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE|APLOG_WIN32ERROR +#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO|APLOG_WIN32ERROR +#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG|APLOG_WIN32ERROR #else /* !WIN32 */ -#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG -#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT -#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT -#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR -#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING -#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE -#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO -#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG -#endif - -#define FCGI_LOG_EMERG_ERRNO __FILE__,__LINE__,APLOG_EMERG /* system is unusable */ -#define FCGI_LOG_ALERT_ERRNO __FILE__,__LINE__,APLOG_ALERT /* action must be taken immediately */ -#define FCGI_LOG_CRIT_ERRNO __FILE__,__LINE__,APLOG_CRIT /* critical conditions */ -#define FCGI_LOG_ERR_ERRNO __FILE__,__LINE__,APLOG_ERR /* error conditions */ -#define FCGI_LOG_WARN_ERRNO __FILE__,__LINE__,APLOG_WARNING /* warning conditions */ -#define FCGI_LOG_NOTICE_ERRNO __FILE__,__LINE__,APLOG_NOTICE /* normal but significant condition */ -#define FCGI_LOG_INFO_ERRNO __FILE__,__LINE__,APLOG_INFO /* informational */ -#define FCGI_LOG_DEBUG_ERRNO __FILE__,__LINE__,APLOG_DEBUG /* debug-level messages */ - -#define FCGI_LOG_EMERG_NOERRNO __FILE__,__LINE__,APLOG_EMERG|APLOG_NOERRNO -#define FCGI_LOG_ALERT_NOERRNO __FILE__,__LINE__,APLOG_ALERT|APLOG_NOERRNO -#define FCGI_LOG_CRIT_NOERRNO __FILE__,__LINE__,APLOG_CRIT|APLOG_NOERRNO -#define FCGI_LOG_ERR_NOERRNO __FILE__,__LINE__,APLOG_ERR|APLOG_NOERRNO -#define FCGI_LOG_WARN_NOERRNO __FILE__,__LINE__,APLOG_WARNING|APLOG_NOERRNO -#define FCGI_LOG_NOTICE_NOERRNO __FILE__,__LINE__,APLOG_NOTICE|APLOG_NOERRNO -#define FCGI_LOG_INFO_NOERRNO __FILE__,__LINE__,APLOG_INFO|APLOG_NOERRNO -#define FCGI_LOG_DEBUG_NOERRNO __FILE__,__LINE__,APLOG_DEBUG|APLOG_NOERRNO +#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG +#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT +#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT +#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR +#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING +#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE +#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO +#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG +#endif + +#define FCGI_LOG_EMERG_ERRNO APLOG_MARK,APLOG_EMERG /* system is unusable */ +#define FCGI_LOG_ALERT_ERRNO APLOG_MARK,APLOG_ALERT /* action must be taken immediately */ +#define FCGI_LOG_CRIT_ERRNO APLOG_MARK,APLOG_CRIT /* critical conditions */ +#define FCGI_LOG_ERR_ERRNO APLOG_MARK,APLOG_ERR /* error conditions */ +#define FCGI_LOG_WARN_ERRNO APLOG_MARK,APLOG_WARNING /* warning conditions */ +#define FCGI_LOG_NOTICE_ERRNO APLOG_MARK,APLOG_NOTICE /* normal but significant condition */ +#define FCGI_LOG_INFO_ERRNO APLOG_MARK,APLOG_INFO /* informational */ +#define FCGI_LOG_DEBUG_ERRNO APLOG_MARK,APLOG_DEBUG /* debug-level messages */ + +#define FCGI_LOG_EMERG_NOERRNO APLOG_MARK,APLOG_EMERG|APLOG_NOERRNO +#define FCGI_LOG_ALERT_NOERRNO APLOG_MARK,APLOG_ALERT|APLOG_NOERRNO +#define FCGI_LOG_CRIT_NOERRNO APLOG_MARK,APLOG_CRIT|APLOG_NOERRNO +#define FCGI_LOG_ERR_NOERRNO APLOG_MARK,APLOG_ERR|APLOG_NOERRNO +#define FCGI_LOG_WARN_NOERRNO APLOG_MARK,APLOG_WARNING|APLOG_NOERRNO +#define FCGI_LOG_NOTICE_NOERRNO APLOG_MARK,APLOG_NOTICE|APLOG_NOERRNO +#define FCGI_LOG_INFO_NOERRNO APLOG_MARK,APLOG_INFO|APLOG_NOERRNO +#define FCGI_LOG_DEBUG_NOERRNO APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO #endif /* !APACHE2 */ ----- End forwarded message ----- --HcAYCG3uE/tztfnV Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="mod_fastcgi-SNAP-0910052141.patch" diff -Naur mod_fastcgi-SNAP-0910052141-orig/fcgi.h mod_fastcgi-SNAP-0910052141/fcgi.h --- mod_fastcgi-SNAP-0910052141-orig/fcgi.h 2012-11-11 16:55:39.274425161 -0800 +++ mod_fastcgi-SNAP-0910052141/fcgi.h 2012-11-11 16:58:36.914431603 -0800 @@ -57,10 +57,10 @@ #define XtOffsetOf APR_OFFSETOF #define ap_select select -#define ap_user_id unixd_config.user_id -#define ap_group_id unixd_config.group_id -#define ap_user_name unixd_config.user_name -#define ap_suexec_enabled unixd_config.suexec_enabled +#define ap_user_id ap_unixd_config.user_id +#define ap_group_id ap_unixd_config.group_id +#define ap_user_name ap_unixd_config.user_name +#define ap_suexec_enabled ap_unixd_config.suexec_enabled #ifndef S_ISDIR #define S_ISDIR(m) (((m)&(S_IFMT)) == (S_IFDIR)) @@ -354,82 +354,82 @@ #ifdef APACHE2 #ifdef WIN32 -#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError()) -#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError()) -#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError()) -#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError()) -#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError()) -#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError()) -#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError()) -#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError()) +#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError()) #else /* !WIN32 */ -#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) -#endif - -#define FCGI_LOG_EMERG_ERRNO __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_ALERT_ERRNO __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_CRIT_ERRNO __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_ERR_ERRNO __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_WARN_ERRNO __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_NOTICE_ERRNO __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_INFO_ERRNO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno) -#define FCGI_LOG_DEBUG_ERRNO __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) - -#define FCGI_LOG_EMERG_NOERRNO __FILE__,__LINE__,APLOG_EMERG,0 -#define FCGI_LOG_ALERT_NOERRNO __FILE__,__LINE__,APLOG_ALERT,0 -#define FCGI_LOG_CRIT_NOERRNO __FILE__,__LINE__,APLOG_CRIT,0 -#define FCGI_LOG_ERR_NOERRNO __FILE__,__LINE__,APLOG_ERR,0 -#define FCGI_LOG_WARN_NOERRNO __FILE__,__LINE__,APLOG_WARNING,0 -#define FCGI_LOG_NOTICE_NOERRNO __FILE__,__LINE__,APLOG_NOTICE,0 -#define FCGI_LOG_INFO_NOERRNO __FILE__,__LINE__,APLOG_INFO,0 -#define FCGI_LOG_DEBUG_NOERRNO __FILE__,__LINE__,APLOG_DEBUG,0 +#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) +#endif + +#define FCGI_LOG_EMERG_ERRNO APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_ALERT_ERRNO APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_CRIT_ERRNO APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_ERR_ERRNO APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_WARN_ERRNO APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_NOTICE_ERRNO APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_INFO_ERRNO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(errno) +#define FCGI_LOG_DEBUG_ERRNO APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(errno) + +#define FCGI_LOG_EMERG_NOERRNO APLOG_MARK,APLOG_EMERG,0 +#define FCGI_LOG_ALERT_NOERRNO APLOG_MARK,APLOG_ALERT,0 +#define FCGI_LOG_CRIT_NOERRNO APLOG_MARK,APLOG_CRIT,0 +#define FCGI_LOG_ERR_NOERRNO APLOG_MARK,APLOG_ERR,0 +#define FCGI_LOG_WARN_NOERRNO APLOG_MARK,APLOG_WARNING,0 +#define FCGI_LOG_NOTICE_NOERRNO APLOG_MARK,APLOG_NOTICE,0 +#define FCGI_LOG_INFO_NOERRNO APLOG_MARK,APLOG_INFO,0 +#define FCGI_LOG_DEBUG_NOERRNO APLOG_MARK,APLOG_DEBUG,0 #else /* !APACHE2 */ #ifdef WIN32 -#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG|APLOG_WIN32ERROR -#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT|APLOG_WIN32ERROR -#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT|APLOG_WIN32ERROR -#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR|APLOG_WIN32ERROR -#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING|APLOG_WIN32ERROR -#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE|APLOG_WIN32ERROR -#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO|APLOG_WIN32ERROR -#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG|APLOG_WIN32ERROR +#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG|APLOG_WIN32ERROR +#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT|APLOG_WIN32ERROR +#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT|APLOG_WIN32ERROR +#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR|APLOG_WIN32ERROR +#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING|APLOG_WIN32ERROR +#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE|APLOG_WIN32ERROR +#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO|APLOG_WIN32ERROR +#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG|APLOG_WIN32ERROR #else /* !WIN32 */ -#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG -#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT -#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT -#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR -#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING -#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE -#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO -#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG -#endif - -#define FCGI_LOG_EMERG_ERRNO __FILE__,__LINE__,APLOG_EMERG /* system is unusable */ -#define FCGI_LOG_ALERT_ERRNO __FILE__,__LINE__,APLOG_ALERT /* action must be taken immediately */ -#define FCGI_LOG_CRIT_ERRNO __FILE__,__LINE__,APLOG_CRIT /* critical conditions */ -#define FCGI_LOG_ERR_ERRNO __FILE__,__LINE__,APLOG_ERR /* error conditions */ -#define FCGI_LOG_WARN_ERRNO __FILE__,__LINE__,APLOG_WARNING /* warning conditions */ -#define FCGI_LOG_NOTICE_ERRNO __FILE__,__LINE__,APLOG_NOTICE /* normal but significant condition */ -#define FCGI_LOG_INFO_ERRNO __FILE__,__LINE__,APLOG_INFO /* informational */ -#define FCGI_LOG_DEBUG_ERRNO __FILE__,__LINE__,APLOG_DEBUG /* debug-level messages */ - -#define FCGI_LOG_EMERG_NOERRNO __FILE__,__LINE__,APLOG_EMERG|APLOG_NOERRNO -#define FCGI_LOG_ALERT_NOERRNO __FILE__,__LINE__,APLOG_ALERT|APLOG_NOERRNO -#define FCGI_LOG_CRIT_NOERRNO __FILE__,__LINE__,APLOG_CRIT|APLOG_NOERRNO -#define FCGI_LOG_ERR_NOERRNO __FILE__,__LINE__,APLOG_ERR|APLOG_NOERRNO -#define FCGI_LOG_WARN_NOERRNO __FILE__,__LINE__,APLOG_WARNING|APLOG_NOERRNO -#define FCGI_LOG_NOTICE_NOERRNO __FILE__,__LINE__,APLOG_NOTICE|APLOG_NOERRNO -#define FCGI_LOG_INFO_NOERRNO __FILE__,__LINE__,APLOG_INFO|APLOG_NOERRNO -#define FCGI_LOG_DEBUG_NOERRNO __FILE__,__LINE__,APLOG_DEBUG|APLOG_NOERRNO +#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG +#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT +#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT +#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR +#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING +#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE +#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO +#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG +#endif + +#define FCGI_LOG_EMERG_ERRNO APLOG_MARK,APLOG_EMERG /* system is unusable */ +#define FCGI_LOG_ALERT_ERRNO APLOG_MARK,APLOG_ALERT /* action must be taken immediately */ +#define FCGI_LOG_CRIT_ERRNO APLOG_MARK,APLOG_CRIT /* critical conditions */ +#define FCGI_LOG_ERR_ERRNO APLOG_MARK,APLOG_ERR /* error conditions */ +#define FCGI_LOG_WARN_ERRNO APLOG_MARK,APLOG_WARNING /* warning conditions */ +#define FCGI_LOG_NOTICE_ERRNO APLOG_MARK,APLOG_NOTICE /* normal but significant condition */ +#define FCGI_LOG_INFO_ERRNO APLOG_MARK,APLOG_INFO /* informational */ +#define FCGI_LOG_DEBUG_ERRNO APLOG_MARK,APLOG_DEBUG /* debug-level messages */ + +#define FCGI_LOG_EMERG_NOERRNO APLOG_MARK,APLOG_EMERG|APLOG_NOERRNO +#define FCGI_LOG_ALERT_NOERRNO APLOG_MARK,APLOG_ALERT|APLOG_NOERRNO +#define FCGI_LOG_CRIT_NOERRNO APLOG_MARK,APLOG_CRIT|APLOG_NOERRNO +#define FCGI_LOG_ERR_NOERRNO APLOG_MARK,APLOG_ERR|APLOG_NOERRNO +#define FCGI_LOG_WARN_NOERRNO APLOG_MARK,APLOG_WARNING|APLOG_NOERRNO +#define FCGI_LOG_NOTICE_NOERRNO APLOG_MARK,APLOG_NOTICE|APLOG_NOERRNO +#define FCGI_LOG_INFO_NOERRNO APLOG_MARK,APLOG_INFO|APLOG_NOERRNO +#define FCGI_LOG_DEBUG_NOERRNO APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO #endif /* !APACHE2 */ --HcAYCG3uE/tztfnV Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ FastCGI-developers mailing list FastCGI-developers-xGejAJT2w6xVgU18Zptdi0EOCMrvLtNR@public.gmane.org http://mailman.fastcgi.com/mailman/listinfo/fastcgi-developers --HcAYCG3uE/tztfnV--