[win32] reverse integrate asperl branch contents (phew!)

 - various fixups to ensure AS stuff does no harm
 - adjust win32/makefiles for the new directory layout (new layout
   looks rather a muddle--needs rework)
 - verified build & test on NT and Solaris/gcc

p4raw-id: //depot/win32/perl@1060

1 files changed, 5 insertions, 5 deletions

diff --git a/mg.h b/mg.h
index c464746557..1490470218 100644
--- a/mg.h
+++ b/mg.h
@@ -8,11 +8,11 @@
  */
 
 struct mgvtbl {
-    int		(*svt_get)	_((SV *sv, MAGIC* mg));
-    int		(*svt_set)	_((SV *sv, MAGIC* mg));
-    U32		(*svt_len)	_((SV *sv, MAGIC* mg));
-    int		(*svt_clear)	_((SV *sv, MAGIC* mg));
-    int		(*svt_free)	_((SV *sv, MAGIC* mg));
+    int		(CPERLscope(*svt_get))	_((SV *sv, MAGIC* mg));
+    int		(CPERLscope(*svt_set))	_((SV *sv, MAGIC* mg));
+    U32		(CPERLscope(*svt_len))	_((SV *sv, MAGIC* mg));
+    int		(CPERLscope(*svt_clear))	_((SV *sv, MAGIC* mg));
+    int		(CPERLscope(*svt_free))	_((SV *sv, MAGIC* mg));
 };
 
 struct magic {