1diff --git a/dist/IO/poll.h b/dist/IO/poll.h 2--- a/dist/IO/poll.h 3+++ b/dist/IO/poll.h 4@@ -22,10 +22,12 @@ 5 6 #define EMULATE_POLL_WITH_SELECT 7 8+#ifdef __VMS 9 #ifdef poll 10 # undef poll 11 #endif 12 #define poll Perl_my_poll 13+#endif 14 15 typedef struct pollfd { 16 int fd; 17diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL 18--- a/ext/Errno/Errno_pm.PL 19+++ b/ext/Errno/Errno_pm.PL 20@@ -125,6 +125,8 @@ sub get_files { 21 # VMS keeps its include files in system libraries 22 if ($^O eq 'VMS') { 23 $file{'Sys$Library:DECC$RTLDEF.TLB'} = 1; 24+ } elsif ($^O eq 'plan9') { 25+ $file{'/sys/include/ape/errno.h'} = 1; 26 } elsif ($^O eq 'os390') { 27 # OS/390 C compiler doesn't generate #file or #line directives 28 $file{'/usr/include/errno.h'} = 1; 29diff --git a/sv.c b/sv.c 30--- a/sv.c 31+++ b/sv.c 32@@ -876,10 +876,10 @@ 33 U8 body_size; /* Size to allocate */ 34 U8 copy; /* Size of structure to copy (may be shorter) */ 35 U8 offset; /* Size of unalloced ghost fields to first alloced field*/ 36- PERL_BITFIELD8 type : 4; /* We have space for a sanity check. */ 37- PERL_BITFIELD8 cant_upgrade : 1;/* Cannot upgrade this type */ 38- PERL_BITFIELD8 zero_nv : 1; /* zero the NV when upgrading from this */ 39- PERL_BITFIELD8 arena : 1; /* Allocated from an arena */ 40+ PERL_BITFIELD8 type; /* We have space for a sanity check. */ 41+ PERL_BITFIELD8 cant_upgrade;/* Cannot upgrade this type */ 42+ PERL_BITFIELD8 zero_nv; /* zero the NV when upgrading from this */ 43+ PERL_BITFIELD8 arena; /* Allocated from an arena */ 44 U32 arena_size; /* Size of arena to allocate */ 45 }; 46 47