summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2000-12-14 22:46:26 +0000
committerJarkko Hietaniemi <jhi@iki.fi>2000-12-14 22:46:26 +0000
commit1503adc40cad8d289062bdd60154f660cdeb7188 (patch)
tree0c143080efbe9e3a23955b675c283ec943ab06f4
parent6e7c79e2a65378ee32615f395c98f31f048ca4cc (diff)
parent18b7339f76ca9f2454845b454e0d2168c487e8ee (diff)
downloadperl-1503adc40cad8d289062bdd60154f660cdeb7188.tar.gz
Integrate perlio:
[ 8117] Win32 tweaks to get Encode to build - temp hack to makedef.pl till PerlIO is properly "exported". - MSVC dislikes static encpage_t foo[]; so make 'em extern for now. [ 8116] Document the new files p4raw-link: @8117 on //depot/perlio: 18b7339f76ca9f2454845b454e0d2168c487e8ee p4raw-link: @8116 on //depot/perlio: 9a5ca08e7f5b67208359eefb1f4b7db6c2880dcb p4raw-id: //depot/perl@8118
-rw-r--r--MANIFEST3
-rwxr-xr-xext/Encode/compile9
-rw-r--r--makedef.pl26
3 files changed, 34 insertions, 4 deletions
diff --git a/MANIFEST b/MANIFEST
index 81094b2aac..6fe1fb16a7 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -192,6 +192,9 @@ ext/DynaLoader/hints/netbsd.pl Hint for DynaLoader for named architecture
ext/DynaLoader/hints/openbsd.pl Hint for DynaLoader for named architecture
ext/Encode/Encode.pm Encode extension
ext/Encode/Encode.xs Encode extension
+ext/Encode/encode.h Encode extension
+ext/Encode/encengine.c Encode extension
+ext/Encode/compile Encode extension
ext/Encode/Makefile.PL Encode extension
ext/Encode/Todo Encode extension
ext/Encode/Encode/EncodeFormat.pod Encoding table format
diff --git a/ext/Encode/compile b/ext/Encode/compile
index 7020b9f186..3a106f39b8 100755
--- a/ext/Encode/compile
+++ b/ext/Encode/compile
@@ -38,6 +38,8 @@ sub encode_M
return &encode_S;
}
+@ARGV = map(glob($_),@ARGV) if $^O eq 'MSWin32';
+
my $cname = shift(@ARGV);
chmod(0666,$cname) if -f $cname && !-w $cname;
open(C,">$cname") || die "Cannot open $cname:$!";
@@ -230,15 +232,14 @@ sub outstring
return $sym;
}
-
-
sub output
{
my ($fh,$name,$a) = @_;
$name =~ s/\W+/_/g;
$a->{Cname} = $name;
my @keys = grep(ref($a->{$_}),sort keys %$a);
- print $fh "\nstatic encpage_t $name\[\];\n";
+ print $fh "\nextern encpage_t $name\[\];\n";
+ # print $fh "\nstatic encpage_t *$name;\n";
# Sub-tables
my %str;
my $l;
@@ -284,7 +285,7 @@ sub output
}
print $fh "\n";
- print $fh "static encpage_t $name\[",scalar(@ent),"] = {\n";
+ print $fh "encpage_t $name\[",scalar(@ent),"] = {\n";
foreach my $b (@ent)
{
my ($s,$e,$out,$t,$end,$l) = @{$a->{$b}};
diff --git a/makedef.pl b/makedef.pl
index 3e0271ab7a..4385f1ac77 100644
--- a/makedef.pl
+++ b/makedef.pl
@@ -797,3 +797,29 @@ perl_destruct
perl_free
perl_parse
perl_run
+PerlIO_define_layer
+PerlIOBuf_set_ptrcnt
+PerlIOBuf_get_cnt
+PerlIOBuf_get_ptr
+PerlIOBuf_bufsiz
+PerlIOBuf_setlinebuf
+PerlIOBase_clearerr
+PerlIOBase_error
+PerlIOBase_eof
+PerlIOBuf_tell
+PerlIOBuf_seek
+PerlIOBuf_write
+PerlIOBuf_unread
+PerlIOBuf_read
+PerlIOBuf_reopen
+PerlIOBuf_open
+PerlIOBuf_fdopen
+PerlIOBase_fileno
+PerlIOBuf_pushed
+PerlIOBuf_fill
+PerlIOBuf_flush
+PerlIOBase_close
+PerlIO_define_layer
+PerlIO_pending
+PerlIO_unread
+PerlIO_push \ No newline at end of file