$config = $dir . "config.sh";
open CONFIG, "< $config";
while(<CONFIG>) {
- $use_threads++ if /usethreads='define'/;
- $use_mymalloc++ if /usemymalloc='Y'/;
- $care_about_case++ if /d_vms_case_sensitive_symbols='define'/;
- $debugging_enabled++ if /usedebugging_perl='Y'/;
- $hide_mymalloc++ if /embedmymalloc='Y'/;
+ $use_threads++ if /usethreads='(define|yes|true|t|y|1)'/i;
+ $use_mymalloc++ if /usemymalloc='(define|yes|true|t|y|1)'/i;
+ $care_about_case++ if /d_vms_case_sensitive_symbols='(define|yes|true|t|y|1)'/i;
+ $debugging_enabled++ if /usedebugging_perl='(define|yes|true|t|y|1)'/i;
+ $hide_mymalloc++ if /embedmymalloc='(define|yes|true|t|y|1)'/i;
$isgcc++ if /gccversion='[^']/;
- $use_perlio++ if /useperlio='define'/;
+ $use_perlio++ if /useperlio='(define|yes|true|t|y|1)'/i;
}
close CONFIG;
}
if ($use_perlio) {
- $preprocess_list = "${dir}perl.h,${dir}perliol.h";
+ $preprocess_list = "${dir}perl.h+${dir}perlapi.h,${dir}perliol.h";
} else {
- $preprocess_list = "${dir}perl.h";
+ $preprocess_list = "${dir}perl.h+${dir}perlapi.h";
}
$used_expectation_enum = $used_opcode_enum = 0; # avoid warnings
else {
open(CPP,"$cpp_file") or die "$0: Can't read preprocessed file $cpp_file: $!\n";
}
-%checkh = map { $_,1 } qw( thread bytecode byterun proto perlio );
+%checkh = map { $_,1 } qw( thread bytecode byterun proto perlio perlvars intrpvar thrdvar );
$ckfunc = 0;
LINE: while (<CPP>) {
while (/^#.*vmsish\.h/i .. /^#.*perl\.h/i) {
}
if ($ckfunc) {
print "$scanname>> $_" if $debug > 2;
- if (/\s*^EXT/) { &scan_var($_); }
+ if (/^\s*EXT/) { &scan_var($_); }
else { &scan_func($_); }
}
else {