Integrate with Sarathy (5.005_58).

p4raw-id: //depot/cfgperl@3799

4 files changed, 10 insertions, 108 deletions

diff --git a/ext/B/byteperl.c b/ext/B/byteperl.c
deleted file mode 100644
index 17dfdee33a..0000000000
--- a/ext/B/byteperl.c
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "EXTERN.h"
-#include "perl.h"
-
-static void xs_init (void);
-static PerlInterpreter *my_perl;
-
-int
-#ifndef CAN_PROTOTYPE
-main(argc, argv, env)
-int argc;
-char **argv;
-char **env;
-#else  /* def(CAN_PROTOTYPE) */
-main(int argc, char **argv, char **env)
-#endif  /* def(CAN_PROTOTYPE) */
-{
-    int exitstatus;
-    int i;
-    char **fakeargv;
-    FILE *fp;
-#ifdef INDIRECT_BGET_MACROS
-    struct bytestream bs;
-#endif /* INDIRECT_BGET_MACROS */
-
-    INIT_SPECIALSV_LIST;
-    PERL_SYS_INIT(&argc,&argv);
- 
-    perl_init_i18nl10n(1);
-
-    if (!PL_do_undump) {
-	my_perl = perl_alloc();
-	if (!my_perl)
-#ifdef VMS
-	    exit(vaxc$errno);
-#else
-	    exit(1);
-#endif
-	perl_construct( my_perl );
-    }
-
-#ifdef CSH
-    if (!PL_cshlen) 
-      PL_cshlen = strlen(PL_cshname);
-#endif
-
-    if (argc < 2)
-	fp = stdin;
-    else {
-#ifdef WIN32
-	fp = fopen(argv[1], "rb");
-#else
-	fp = fopen(argv[1], "r");
-#endif
-	if (!fp) {
-	    perror(argv[1]);
-#ifdef VMS
-	    exit(vaxc$errno);
-#else
-	    exit(1);
-#endif
-	}
-	argv++;
-	argc--;
-    }
-    New(666, fakeargv, argc + 4, char *);
-    fakeargv[0] = argv[0];
-    fakeargv[1] = "-e";
-    fakeargv[2] = "";
-    fakeargv[3] = "--";
-    for (i = 1; i < argc; i++)
-	fakeargv[i + 3] = argv[i];
-    fakeargv[argc + 3] = 0;
-    
-    exitstatus = perl_parse(my_perl, xs_init, argc + 3, fakeargv, NULL);
-    if (exitstatus)
-	exit( exitstatus );
-
-    sv_setpv(GvSV(gv_fetchpv("0", TRUE, SVt_PV)), argv[0]);
-    PL_main_cv = PL_compcv;
-    PL_compcv = 0;
-
-#ifdef INDIRECT_BGET_MACROS
-    bs.data = fp;
-    bs.fgetc = (int(*) (void*))fgetc;
-    bs.fread = (int(*) (char*,size_t,size_t,void*))fread;
-    bs.freadpv = freadpv;
-    byterun(bs);
-#else    
-    byterun(fp);
-#endif /* INDIRECT_BGET_MACROS */
-    
-    exitstatus = perl_run( my_perl );
-
-    perl_destruct( my_perl );
-    perl_free( my_perl );
-
-    exit( exitstatus );
-}
-
-static void
-xs_init()
-{
-}
diff --git a/ext/Devel/DProf/DProf.xs b/ext/Devel/DProf/DProf.xs
index 62ad464070..291742123b 100644
--- a/ext/Devel/DProf/DProf.xs
+++ b/ext/Devel/DProf/DProf.xs
@@ -30,7 +30,7 @@ static U32 dprof_ticks;
 
 /* HZ == clock ticks per second */
 #ifdef VMS
-#  define HZ CLK_TCK
+#  define HZ ((I32)CLK_TCK)
 #  define DPROF_HZ HZ
 #  include <starlet.h>  /* prototype for sys$gettim() */
    clock_t dprof_times(struct tms *bufptr) {
@@ -60,7 +60,7 @@ static U32 dprof_ticks;
 #else
 #  ifndef HZ
 #    ifdef CLK_TCK
-#      define HZ CLK_TCK
+#      define HZ ((I32)CLK_TCK)
 #    else
 #      define HZ 60
 #    endif
diff --git a/ext/POSIX/POSIX.pm b/ext/POSIX/POSIX.pm
index 84298cb69a..d43b8ca282 100644
--- a/ext/POSIX/POSIX.pm
+++ b/ext/POSIX/POSIX.pm
@@ -1,6 +1,7 @@
 package POSIX;
 
-use vars qw($VERSION @ISA %EXPORT_TAGS @EXPORT_OK $AUTOLOAD); 
+# use vars qw($VERSION @ISA %EXPORT_TAGS @EXPORT_OK $AUTOLOAD); 
+(@ISA, %EXPORT_TAGS,@EXPORT_OK,$AUTOLOAD) = ();
 
 use Carp;
 use AutoLoader;
@@ -11,7 +12,7 @@ require Exporter;
 require DynaLoader;
 @ISA = qw(Exporter DynaLoader);
 
-$VERSION = "1.02" ;
+$VERSION = $VERSION = "1.03" ;
 
 %EXPORT_TAGS = (
 
@@ -161,7 +162,10 @@ $VERSION = "1.02" ;
 
 );
 
-Exporter::export_tags();
+# Exporter::export_tags();
+for (values %EXPORT_TAGS) {
+  push @EXPORT, @$_;
+}
 
 @EXPORT_OK = qw(
     closedir opendir readdir rewinddir
diff --git a/ext/SDBM_File/Makefile.PL b/ext/SDBM_File/Makefile.PL
index 749478551f..afce3f1a54 100644
--- a/ext/SDBM_File/Makefile.PL
+++ b/ext/SDBM_File/Makefile.PL
@@ -16,6 +16,7 @@ WriteMakefile(
               XSPROTOARG => '-noprototypes', 		# XXX remove later?
               VERSION_FROM => 'SDBM_File.pm',
               DEFINE => $define,
+	      PERL_MALLOC_OK => 1,
              );
 
 sub MY::postamble {