applied patch, slightly tweaked

	Message-Id: <3.0.5.32.19980713115227.00a73970@ous.edu>
	Subject: [PATCH 5.004_73]Get re module working on VMS

p4raw-id: //depot/perl@1486

diff --git a/ext/re/Makefile.PL b/ext/re/Makefile.PL
index e21b923..9ed83d1 100644 (file)
--- a/ext/re/Makefile.PL
+++ b/ext/re/Makefile.PL
@@ -10,6 +10,23 @@ WriteMakefile(
 );
 
 sub MY::postamble {
+  if ($^O eq 'VMS') {
+    return <<'VMS_EOF';
+re_comp.c : [--]regcomp.c
+       - $(RM_F) $(MMS$TARGET_NAME)
+       $(CP) [--]regcomp.c $(MMS$TARGET_NAME)
+
+re_comp$(OBJ_EXT) : re_comp.c
+
+re_exec.c : [--]regexec.c
+       - $(RM_F) $(MMS$TARGET_NAME)
+       $(CP) [--]regexec.c $(MMS$TARGET_NAME)
+
+re_exec$(OBJ_EXT) : re_exec.c
+
+
+VMS_EOF
+  } else {
     return <<'EOF';
 re_comp.c: ../../regcomp.c
        -$(RM_F) $@
@@ -20,4 +37,5 @@ re_exec.c: ../../regexec.c
        $(CP) ../../regexec.c $@
 
 EOF
+  }
 }

diff --git a/perl.h b/perl.h
index a9aaa4d..6d4cea7 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -1857,10 +1857,6 @@ typedef I32 (*regexec_t) _((regexp* prog, char* stringarg, char* strend, char*
                            strbeg, I32 minend, SV* screamer, void* data, 
                            U32 flags));
 
-EXT regexp*    pregcomp _((char* exp, char* xend, PMOP* pm));
-EXT I32                regexec_flags _((regexp* prog, char* stringarg, char* strend,
-                        char* strbeg, I32 minend, SV* screamer,
-                        void* data, U32 flags));
 #endif
 
 /* Set up PERLVAR macros for populating structs */

diff --git a/proto.h b/proto.h
index 9e99392..e1b91dc 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -880,6 +880,10 @@ VIRTUAL SV**       get_specialsv_list _((void));
 VIRTUAL int&   ErrorNo _((void));
 #endif /* WIN32 */
 #else  /* !PERL_OBJECT */
+regexp*        pregcomp _((char* exp, char* xend, PMOP* pm));
+I32            regexec_flags _((regexp* prog, char* stringarg, char* strend,
+                        char* strbeg, I32 minend, SV* screamer,
+                        void* data, U32 flags));
 END_EXTERN_C
 #endif /* PERL_OBJECT */