diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1997-11-14 22:04:58 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1997-11-14 22:04:58 +0000 |
| commit | 2d63e3e140948d3d027cbbf76f121ae5d9c2fa6f (patch) | |
| tree | 21068467e062aa49fa127017a1d135666bb91b4c /perl.h | |
| parent | dc0502853eaa4689351eeccc4becf89ec85060e0 (diff) | |
| parent | 3d57aefb538705242f5ab4c3d9d854139b302aba (diff) | |
| download | perl-2d63e3e140948d3d027cbbf76f121ae5d9c2fa6f.tar.gz | |
Integrate mainline changes into win32 branch. Now would be a good time
to reverse integrate the win32 branch into mainline.
p4raw-id: //depot/win32/perl@253
Diffstat (limited to 'perl.h')
| -rw-r--r-- | perl.h | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -884,11 +884,6 @@ register struct op *op asm(stringify(OP_IN_REGISTER)); #endif -/* Digital UNIX defines a typedef CONTEXT when pthreads is in use */ -#if defined(__osf__) -# define CONTEXT PERL_CONTEXT -#endif - typedef MEM_SIZE STRLEN; typedef struct op OP; @@ -917,7 +912,7 @@ typedef struct regexp REGEXP; typedef struct gp GP; typedef struct gv GV; typedef struct io IO; -typedef struct context CONTEXT; +typedef struct context PERL_CONTEXT; typedef struct block BLOCK; typedef struct magic MAGIC; @@ -1949,7 +1944,7 @@ IEXT OP * Ieval_start; IEXT COP * VOL Icurcop IINIT(&compiling); IEXT COP * Icurcopdb IINIT(NULL); IEXT line_t Icopline IINIT(NOLINE); -IEXT CONTEXT * Icxstack; +IEXT PERL_CONTEXT * Icxstack; IEXT I32 Icxstack_ix IINIT(-1); IEXT I32 Icxstack_max IINIT(128); IEXT JMPENV Istart_env; /* empty startup sigjmp() environment */ |