Author: pgollucci
Date: Wed May 31 23:53:36 2006
New Revision: 410776

URL: http://svn.apache.org/viewvc?rev=410776&view=rev
Log:
PERL_SYS_INIT3(argc, argc, env) -> 
    PERL_SYS_INIT(argc, argv)  ->
        MALLOC_CHECK_TAINT2(*c,*v) ->
            MALLOC_CHECK_TAINT(argc,argv,NULL) ->

            #if MYMALLOC
                stuff
            #else
                #define MALLOC_CHECK_TAINT(argc, argv, env)
            #endif

gcc 4.x.x (tested gcc 4.1.2 / perl 5.8.8)
  visual inspection of perl 5.6.2, 5.8.1
  note, in 5.6.2 the #define path is different and its #define'd away sooner.
  see perl.h and unixish.h in the perl source code.

mod_perl.c: In function 'modperl_sys_init':
mod_perl.c:561: warning: value computed is not used

PERL_SYS_INIT3 is completely #ifdef'd away under -Dusemymalloc=n


Modified:
    perl/modperl/trunk/Changes
    perl/modperl/trunk/src/modules/perl/mod_perl.c

Modified: perl/modperl/trunk/Changes
URL: 
http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=410776&r1=410775&r2=410776&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Wed May 31 23:53:36 2006
@@ -12,6 +12,11 @@
 
 =item 2.0.3-dev
 
+gcc 4.x compile error:
+if using MP_MAINTAINER=1 and -Dusemymalloc=n (to perl)
+PERL_SYS_INT3() is #defined away.
+[Philip M. Gollucci]
+
 Require B::Size 0.07 and B::TerseSize 0.07 for Apache2::Status
 [Philip M. Gollucci]
 

Modified: perl/modperl/trunk/src/modules/perl/mod_perl.c
URL: 
http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/mod_perl.c?rev=410776&r1=410775&r2=410776&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/mod_perl.c (original)
+++ perl/modperl/trunk/src/modules/perl/mod_perl.c Wed May 31 23:53:36 2006
@@ -550,15 +550,19 @@
  */
 static apr_status_t modperl_sys_init(void)
 {
+#ifdef MYMALLOC
     int argc = 0;
     char **argv = NULL, **env = NULL;
+#endif /* MYMALLOC */
 
     MP_TRACE_i(MP_FUNC, "mod_perl sys init\n");
 
+#ifdef MYMALLOC
     /* not every OS uses those vars in PERL_SYS_INIT3 macro */
     argc = argc; argv = argv; env = env;
 
     PERL_SYS_INIT3(&argc, &argv, &env);
+#endif /* MYMALLOC */
 
 #if 0 /*XXX*/
 #ifdef PTHREAD_ATFORK


Reply via email to