Revert to Andy's first solution for nonnull attributes;

add the missing defines for non-threaded perls in perl.h

p4raw-id: //depot/perl@24421

1 files changed, 2 insertions, 0 deletions

diff --git a/perl.h b/perl.h
index bb0081c95f..c02f9a724c 100644
--- a/perl.h
+++ b/perl.h
@@ -229,6 +229,8 @@
 #  define pTHX_2	2
 #  define pTHX_3	3
 #  define pTHX_4	4
+#  define pTHX_5	5
+#  define pTHX_6	6
 #endif
 
 #ifndef dVAR