diff -Naur extproc_perl-0.95.old/Changes extproc_perl-0.95.new/Changes --- extproc_perl-0.95.old/Changes Sat Apr 12 13:03:34 2003 +++ extproc_perl-0.95.new/Changes Sat Apr 12 15:04:48 2003 @@ -1,9 +1,9 @@ -$Id: Changes,v 1.10 2003/04/12 17:03:30 jeff Exp $ +$Id: Changes,v 1.11 2003/04/12 19:04:46 jeff Exp $ 0.95 Sat Apr 12 13:03:20 EDT 2003 * Added support for calling a Perl subroutine as a procedure * Procedural calls enable support of DML statements from the - external proceudure + external procedure * Added Fcntl as a default built-in module * Can add to default module list instead of replacing it * _preload() special subroutine forces loading of code from database diff -Naur extproc_perl-0.95.old/extproc_perl.c extproc_perl-0.95.new/extproc_perl.c --- extproc_perl-0.95.old/extproc_perl.c Sat Apr 12 12:15:47 2003 +++ extproc_perl-0.95.new/extproc_perl.c Sat Apr 12 18:32:28 2003 @@ -8,7 +8,7 @@ * under the same terms as Perl itself. */ -/* $Id: extproc_perl.c,v 1.23 2003/04/12 16:15:35 jeff Exp $ */ +/* $Id: extproc_perl.c,v 1.24 2003/04/12 22:32:04 jeff Exp $ */ #ifdef __cplusplus extern "C" { @@ -28,10 +28,14 @@ #define EXTPROC_PERL_VERSION "0.95" +#define PERL_NO_GET_CONTEXT + static PerlInterpreter *perl; static char code_table[256]; OCIExtProcContext *this_ctx; /* for ExtProc module */ +EXTERN_C void xs_init(); + void ora_exception(OCIExtProcContext *ctx, char *msg) { char str[1024]; @@ -47,6 +51,8 @@ char *argv[3]; struct stat st; + dTHX; + /* create interpreter */ if((p = perl_alloc()) == NULL) { return(NULL); @@ -98,6 +104,9 @@ int nret; char *tmp, *retval, **p; SV *sv; + + dTHX; + dSP; /* push arguments onto stack */ @@ -144,6 +153,8 @@ short ind; char *args[MAXARGS], *retval, code[MAX_CODE_SIZE]; + dTHX; + /* set OCI context for ExtProc module */ this_ctx = ctx; @@ -261,6 +272,8 @@ va_list ap; short ind; char *args[MAXARGS], code[MAX_CODE_SIZE]; + + dTHX; /* set OCI context for ExtProc module */ this_ctx = ctx; diff -Naur extproc_perl-0.95.old/extproc_perl.h extproc_perl-0.95.new/extproc_perl.h --- extproc_perl-0.95.old/extproc_perl.h Fri Apr 11 12:25:12 2003 +++ extproc_perl-0.95.new/extproc_perl.h Sat Apr 12 18:32:29 2003 @@ -8,7 +8,7 @@ * under the same terms as Perl itself. */ -/* $Id: extproc_perl.h,v 1.10 2002/11/18 01:22:33 jhorwitz Exp $ */ +/* $Id: extproc_perl.h,v 1.11 2003/04/12 22:32:04 jeff Exp $ */ #ifndef EXTPROC_PERL_H #define EXTPROC_PERL_H @@ -33,8 +33,6 @@ OCIDefine *dfn3p; /* For OCI Define Handle */ }; typedef struct ocictx ocictx; - -void xs_init(void); void ora_exception(OCIExtProcContext *, char *);