Convert xsutils.c and lib/attributes.pm to a regular XS extension.

8 files changed, 11 insertions, 15 deletions

diff --git a/win32/Makefile b/win32/Makefile
index a72448263f..3de30cb2ea 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -688,8 +688,7 @@ MICROCORE_SRC	=		\
 		..\toke.c	\
 		..\universal.c	\
 		..\utf8.c	\
-		..\util.c	\
-		..\xsutils.c
+		..\util.c
 
 EXTRACORE_SRC	= $(EXTRACORE_SRC) perllib.c
 
@@ -1154,7 +1153,7 @@ distclean: realclean
 	-del /f $(EXTDIR)\DynaLoader\XSLoader.pm
 	-del /f $(LIBDIR)\Encode.pm $(LIBDIR)\encoding.pm $(LIBDIR)\Errno.pm
 	-del /f $(LIBDIR)\Config.pod $(LIBDIR)\POSIX.pod $(LIBDIR)\threads.pm
-	-del /f $(LIBDIR)\.exists $(LIBDIR)\DynaLoader.pm
+	-del /f $(LIBDIR)\.exists $(LIBDIR)\attributes.pm $(LIBDIR)\DynaLoader.pm
 	-del /f $(LIBDIR)\XSLoader.pm $(LIBDIR)\lib.pm
 	-del /f $(LIBDIR)\Fcntl.pm $(LIBDIR)\IO.pm $(LIBDIR)\Opcode.pm
 	-del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm
diff --git a/win32/Makefile.ce b/win32/Makefile.ce
index cb96f332b8..7b5c2bcdab 100644
--- a/win32/Makefile.ce
+++ b/win32/Makefile.ce
@@ -593,8 +593,7 @@ MICROCORE_SRC	=		\
 		..\toke.c	\
 		..\universal.c	\
 		..\utf8.c	\
-		..\util.c	\
-		..\xsutils.c
+		..\util.c
 
 EXTRACORE_SRC	= $(EXTRACORE_SRC) perllib.c
 
@@ -654,7 +653,7 @@ CORE_NOCFG_H	=		\
 		.\include\sys\socket.h	\
 		.\win32.h
 
-DYNAMIC_EXT	= Socket IO Fcntl Opcode SDBM_File POSIX B re \
+DYNAMIC_EXT	= Socket IO Fcntl Opcode SDBM_File POSIX attributes B re \
 		Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \
 		Sys/Hostname
 
@@ -822,7 +821,6 @@ $(DLLDIR)\win32thread.obj \
 $(DLLDIR)\wince.obj \
 $(DLLDIR)\win32io.obj \
 $(DLLDIR)\wincesck.obj \
-$(DLLDIR)\xsutils.obj \
 $(DLLDIR)\perllib.obj \
 $(DLLDIR)\DynaLoader.obj
 !IF "$(PERL_MALLOC)" == "define"
diff --git a/win32/config.bc b/win32/config.bc
index 37cc9c6781..6743f14de7 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -534,7 +534,7 @@ doublesize='8'
 drand01='(rand()/(double)((unsigned)1<<RANDBITS))'
 drand48_r_proto='0'
 dtrace=''
-dynamic_ext='Socket IO Fcntl Opcode SDBM_File'
+dynamic_ext='Socket IO Fcntl Opcode SDBM_File attributes'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
diff --git a/win32/config.ce b/win32/config.ce
index 6cb5b37643..cee1175077 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -536,7 +536,7 @@ doublesize='8'
 drand01='(rand()/(double)((unsigned)1<<RANDBITS))'
 drand48_r_proto='0'
 dtrace=''
-dynamic_ext='Socket IO Fcntl Opcode SDBM_File'
+dynamic_ext='Socket IO Fcntl Opcode SDBM_File attributes'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
diff --git a/win32/config.gc b/win32/config.gc
index 64e97423f1..018f17499f 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -534,7 +534,7 @@ doublesize='8'
 drand01='(rand()/(double)((unsigned)1<<RANDBITS))'
 drand48_r_proto='0'
 dtrace=''
-dynamic_ext='Socket IO Fcntl Opcode SDBM_File'
+dynamic_ext='Socket IO Fcntl Opcode SDBM_File attributes'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
diff --git a/win32/config.vc b/win32/config.vc
index c893c9100e..e0c6354051 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -534,7 +534,7 @@ doublesize='8'
 drand01='(rand()/(double)((unsigned)1<<RANDBITS))'
 drand48_r_proto='0'
 dtrace=''
-dynamic_ext='Socket IO Fcntl Opcode SDBM_File'
+dynamic_ext='Socket IO Fcntl Opcode SDBM_File attributes'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
diff --git a/win32/config.vc64 b/win32/config.vc64
index a8e409b22b..44ab7f297c 100644
--- a/win32/config.vc64
+++ b/win32/config.vc64
@@ -534,7 +534,7 @@ doublesize='8'
 drand01='(rand()/(double)((unsigned)1<<RANDBITS))'
 drand48_r_proto='0'
 dtrace=''
-dynamic_ext='Socket IO Fcntl Opcode SDBM_File'
+dynamic_ext='Socket IO Fcntl Opcode SDBM_File attributes'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 78c546ebf5..915d8b9e9e 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -846,8 +846,7 @@ MICROCORE_SRC	=		\
 		..\toke.c	\
 		..\universal.c	\
 		..\utf8.c	\
-		..\util.c	\
-		..\xsutils.c
+		..\util.c
 
 EXTRACORE_SRC	+= perllib.c
 
@@ -1476,7 +1475,7 @@ distclean: realclean
 	-del /f $(EXTDIR)\DynaLoader\XSLoader.pm
 	-del /f $(LIBDIR)\Encode.pm $(LIBDIR)\encoding.pm $(LIBDIR)\Errno.pm
 	-del /f $(LIBDIR)\Config.pod $(LIBDIR)\POSIX.pod $(LIBDIR)\threads.pm
-	-del /f $(LIBDIR)\.exists $(LIBDIR)\DynaLoader.pm
+	-del /f $(LIBDIR)\.exists $(LIBDIR)\attributes.pm $(LIBDIR)\DynaLoader.pm
 	-del /f $(LIBDIR)\XSLoader.pm $(LIBDIR)\lib.pm
 	-del /f $(LIBDIR)\Fcntl.pm $(LIBDIR)\IO.pm $(LIBDIR)\Opcode.pm
 	-del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm