diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 2000-07-11 17:19:08 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 2000-07-11 17:19:08 +0000 |
| commit | 25fbdfc0879f30cf6944c322d4607eea9bcc7d15 (patch) | |
| tree | 11310a9b8068c3e48d0840326815099a002e1444 /perl.h | |
| parent | 4e94524934c1af4124b2888d9716e5304ee50ad9 (diff) | |
| parent | fecfaeb8bbdf3ab93ea88558d0ee3a60234c5047 (diff) | |
| download | perl-25fbdfc0879f30cf6944c322d4607eea9bcc7d15.tar.gz | |
integrate cfgperl changes#6174..6203 into mainline (first of several)
p4raw-link: @6203 on //depot/cfgperl: fecfaeb8bbdf3ab93ea88558d0ee3a60234c5047
p4raw-link: @6174 on //depot/metaconfig: cfd1a6dce7dce25772bf4f5399e251457574eeeeon //depot/cfgperl: 12ae5dfcd4fd6f54af051c41b2e122532efce8d3
p4raw-id: //depot/perl@6343
Diffstat (limited to 'perl.h')
| -rw-r--r-- | perl.h | 21 |
1 files changed, 20 insertions, 1 deletions
@@ -21,7 +21,11 @@ #endif /* PERL_FOR_X2P */ #define VOIDUSED 1 -#include "config.h" +#ifdef PERL_MICRO +# include "uconfig.h" +#else +# include "config.h" +#endif #if defined(USE_ITHREADS) && defined(USE_5005THREADS) # include "error: USE_ITHREADS and USE_5005THREADS are incompatible" @@ -461,6 +465,10 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER)); #undef METHOD #endif +#ifdef PERL_MICRO +# define NO_LOCALE +#endif + #ifdef I_LOCALE # include <locale.h> #endif @@ -594,6 +602,7 @@ struct perl_mstats { # endif # endif #else +# undef memset # define memset(d,c,l) my_memset(d,c,l) #endif /* HAS_MEMSET */ @@ -813,6 +822,12 @@ struct perl_mstats { # endif #endif +#ifdef PERL_MICRO +# ifndef DIR +# define DIR void +# endif +#endif + #ifdef FPUTS_BOTCH /* work around botch in SunOS 4.0.1 and 4.0.2 */ # ifndef fputs @@ -2795,10 +2810,14 @@ EXT MGVTBL PL_vtbl_envelem = {0, MEMBER_TO_FPTR(Perl_magic_setenv), 0, MEMBER_TO_FPTR(Perl_magic_clearenv), 0}; EXT MGVTBL PL_vtbl_sig = {0, 0, 0, 0, 0}; +#ifdef PERL_MICRO +EXT MGVTBL PL_vtbl_sigelem = {0, 0, 0, 0, 0}; +#else EXT MGVTBL PL_vtbl_sigelem = {MEMBER_TO_FPTR(Perl_magic_getsig), MEMBER_TO_FPTR(Perl_magic_setsig), 0, MEMBER_TO_FPTR(Perl_magic_clearsig), 0}; +#endif EXT MGVTBL PL_vtbl_pack = {0, 0, MEMBER_TO_FPTR(Perl_magic_sizepack), MEMBER_TO_FPTR(Perl_magic_wipepack), 0}; EXT MGVTBL PL_vtbl_packelem = {MEMBER_TO_FPTR(Perl_magic_getpack), |