diff options
author | Douglas Lankshear <doug@lankshear.net> | 1998-06-19 03:59:50 -0700 |
---|---|---|
committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-06-21 06:27:57 +0000 |
commit | 7da709d65cb4c7b9d26ab85bbea536d0bc34c93f (patch) | |
tree | c54698f2d90c2834241f5b59fd235394221bc509 /perl.h | |
parent | ef3f1e413e6204a864c5a29f4ccdfa19761f9e4f (diff) | |
download | perl-7da709d65cb4c7b9d26ab85bbea536d0bc34c93f.tar.gz |
applied patch, along with many changes:
- ipfoo.h headers have been coalesced along with perlfoo.h into
iperlsys.h
- win32/cp*.h have been combined in perlhost.h
- CPerlObj::PerlParse() takes an extra xsinit arg
- tweaks to get dl_win32.xs compiling again w/ PERL_OBJECT
Message-Id: <000001bd9b8c$0417fe90$a32fa8c0@tau.Active>
Subject: RE: [PATCH 5.004_67] Fixes for broken MS compiler
p4raw-id: //depot/perl@1172
Diffstat (limited to 'perl.h')
-rw-r--r-- | perl.h | 20 |
1 files changed, 7 insertions, 13 deletions
@@ -90,8 +90,8 @@ are local to a function. PERL HOST 1. The perl host is linked with perlX.lib to get perl_alloc. This function will return a pointer to CPerlObj (the PERL_OBJECT). It -takes pointers to the various PerlXXX_YYY interfaces (see ipdir.h for -information on this). +takes pointers to the various PerlXXX_YYY interfaces (see iperlsys.h +for more information on this). 2. The perl host calls the same functions as normally would be called in setting up and running a perl script, except that the functions are now member functions of the PERL_OBJECT. @@ -312,13 +312,7 @@ register struct op *op asm(stringify(OP_IN_REGISTER)); # endif #endif -#include "perlio.h" -#include "perlmem.h" -#include "perllio.h" -#include "perlsock.h" -#include "perlproc.h" -#include "perlenv.h" -#include "perldir.h" +#include "iperlsys.h" #ifdef USE_NEXT_CTYPE @@ -1207,17 +1201,17 @@ typedef pthread_key_t perl_key; # endif #endif +#ifdef UNION_ANY_DEFINITION +UNION_ANY_DEFINITION; +#else union any { void* any_ptr; I32 any_i32; IV any_iv; long any_long; void (CPERLscope(*any_dptr)) _((void*)); -#if defined(WIN32) && !defined(PERL_OBJECT) - /* Visual C thinks that a pointer to a member variable is 16 bytes in size. */ - char handle_VC_problem[16]; -#endif }; +#endif #ifdef USE_THREADS #define ARGSproto struct perl_thread *thr |