cvs commit: mod_parrot mod_parrot.c apache.pmc

cvsuser     02/09/03 13:14:25

  Modified:    .        mod_parrot.c apache.pmc
  Log:
  apache.pmc: remove noinit, otherwise the find_type op fails to work
  mod_parrot.c: fix to use embed.h properly
  
  Revision  Changes    Path
  1.11      +3 -3      mod_parrot/mod_parrot.c
  
  Index: mod_parrot.c
  ===================================================================
  RCS file: /cvs/public/mod_parrot/mod_parrot.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -w -r1.10 -r1.11
  --- mod_parrot.c	5 Jul 2002 21:45:41 -0000	1.10
  +++ mod_parrot.c	3 Sep 2002 20:14:24 -0000	1.11
  @@ -7,6 +7,7 @@
   #include "util_script.h"
   
   #include "parrot/parrot.h"
  +#include "parrot/embed.h"
   #include "parrot/register.h"
   
   #include <stdio.h>
  @@ -135,16 +136,15 @@
   #if MODULE_MAGIC_NUMBER >= 19980527
       ap_add_version_component("mod_parrot/0.04");
   #endif
  -  // init Parrot
  +  /* init Parrot */
     init_world();
     interpreter = Parrot_new();
  -  Parrot_init(interpreter);
  +  Parrot_init(interpreter,NULL);
   
   }
   
   static void mod_parrot_child_exit(server_rec *s, pool *p)
   {
  -  //
     Parrot_destroy(interpreter);
   }
   
  
  
  
  1.5       +4 -3      mod_parrot/apache.pmc
  
  Index: apache.pmc
  ===================================================================
  RCS file: /cvs/public/mod_parrot/apache.pmc,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- apache.pmc	3 Sep 2002 16:02:51 -0000	1.4
  +++ apache.pmc	3 Sep 2002 20:14:24 -0000	1.5
  @@ -1,6 +1,6 @@
   /* apache.pmc
    *  Copyright: (When this is determined...it will go here)
  - *  CVS Info $Id: apache.pmc,v 1.4 2002/09/03 16:02:51 falcone Exp $
  + *  CVS Info $Id: apache.pmc,v 1.5 2002/09/03 20:14:24 falcone Exp $
    *  Overview:
    *     These are the vtable functions for the ApachePMC class
    *     Provides access to Apache's r object
  @@ -43,9 +43,10 @@
   
   #define INT2KEY(i,k) ((k) ? key_new_integer((i), *(k)) : NULL)
   
  -pmclass Apache noinit {
  +pmclass Apache {
   
       void init () {
  +	SELF->vtable->base_type = enum_class_Apache;
       }
   
       void init_pmc (PMC* value) {
  @@ -95,7 +96,7 @@
       }
   
       STRING* name () {
  -        return NULL;
  +        return whoami;
       }
   
       STRING* name_keyed (PMC* key) {