perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tors...@apache.org
Subject svn commit: r700360 - in /perl/modperl/branches/threading: ./ src/modules/perl/modperl_apache_compat.c src/modules/perl/modperl_common_log.h
Date Tue, 30 Sep 2008 06:48:21 GMT
Author: torsten
Date: Mon Sep 29 23:48:20 2008
New Revision: 700360

URL: http://svn.apache.org/viewvc?rev=700360&view=rev
Log:
Merged revisions 693357 via svnmerge from 
https://svn.eu.apache.org/repos/asf/perl/modperl/trunk

........
  r693357 | gozer | 2008-09-09 05:46:19 +0200 (Tue, 09 Sep 2008) | 6 lines
  
  __func__ is gcc-specific, use the safer, cross-platform MP_FUNC instead.
  
  Note: this needed exposing MP_FUNC all the time, not just when MP_TRACE is enabled,
  but since it's a preprocessor macro, it will not hurt at all.
........

Modified:
    perl/modperl/branches/threading/   (props changed)
    perl/modperl/branches/threading/src/modules/perl/modperl_apache_compat.c
    perl/modperl/branches/threading/src/modules/perl/modperl_common_log.h

Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 29 23:48:20 2008
@@ -1 +1 @@
-/perl/modperl/trunk:594682-672484,672819-681118
+/perl/modperl/trunk:594682-672484,672819-681118,693357

Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep 29 23:48:20 2008
@@ -1 +1 @@
-/perl/modperl/trunk:1-681650
+/perl/modperl/trunk:1-700359

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_apache_compat.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_apache_compat.c?rev=700360&r1=700359&r2=700360&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_apache_compat.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_apache_compat.c Mon Sep 29 23:48:20
2008
@@ -36,7 +36,7 @@
         dTHX; \
         Perl_warn(aTHX_ "%s() not available until httpd/%s " \
                         "falling back to %s()", \
-                  __func__, ver, fallback); \
+                  MP_FUNC, ver, fallback); \
     }
 
 /* added in APACHE_2.2.4 */
@@ -59,7 +59,7 @@
         dTHX; \
         Perl_warn(aTHX_ "%s() is deprecated since httpd/%s " \
                         "try using %s() instead", \
-                  __func__, ver, fallback); \
+                  MP_FUNC, ver, fallback); \
     }
 
 AP_DECLARE(const char *) ap_get_server_version(void) {

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_common_log.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_common_log.h?rev=700360&r1=700359&r2=700360&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_common_log.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_common_log.h Mon Sep 29 23:48:20
2008
@@ -20,7 +20,6 @@
 #define MP_STRINGIFY(n) MP_STRINGIFY_HELPER(n)
 #define MP_STRINGIFY_HELPER(n) #n
 
-#ifdef MP_TRACE
 #   if defined(__GNUC__)
 #      if (__GNUC__ > 2)
 #         define MP_FUNC __func__
@@ -30,9 +29,6 @@
 #   else
 #      define MP_FUNC __FILE__ ":" MP_STRINGIFY(__LINE__)
 #   endif
-#else
-#   define MP_FUNC NULL
-#endif
 
 #include "modperl_apr_includes.h"
 #include "apr_lib.h"



Mime
View raw message