PPPort dTHX.

p4raw-id: //depot/perl@16751

diff --git a/ext/Devel/PPPort/PPPort.pm b/ext/Devel/PPPort/PPPort.pm
index d5e71f4..83a2aa8 100644 (file)
--- a/ext/Devel/PPPort/PPPort.pm
+++ b/ext/Devel/PPPort/PPPort.pm
@@ -381,8 +381,33 @@ __DATA__
 /* Replace: 0 */
 #endif
 
+#ifdef HASATTRIBUTE
+#  if defined(__GNUC__) && defined(__cplusplus)
+#    define PERL_UNUSED_DECL
+#  else
+#    define PERL_UNUSED_DECL __attribute__((unused))
+#  endif
+#else
+#  define PERL_UNUSED_DECL
+#endif
+
+#ifndef dNOOP
+#  define NOOP (void)0
+#  define dNOOP extern int Perl___notused PERL_UNUSED_DECL
+#endif
+
+#ifndef dTHR
+#  define dTHR          dNOOP
+#endif
+
+#ifndef dTHX
+#  define dTHX          dNOOP
+#  define dTHXa(x)      dNOOP
+#  define dTHXoa(x)     dNOOP
+#endif
+
 #ifndef pTHX
-#    define pTHX
+#    define pTHX       void
 #    define pTHX_
 #    define aTHX
 #    define aTHX_
@@ -396,14 +421,6 @@ __DATA__
 #    define INT2PTR(any,d)      (any)(d)
 #endif
 
-#ifndef dTHR
-#  ifdef WIN32
-#      define dTHR extern int Perl___notused
-#  else
-#      define dTHR extern int errno
-#  endif
-#endif
-
 #ifndef boolSV
 #      define boolSV(b) ((b) ? &PL_sv_yes : &PL_sv_no)
 #endif
@@ -511,20 +528,6 @@ SV *sv;
 
 #endif /* newCONSTSUB */
 
-#ifndef NOOP
-#  define NOOP (void)0
-#endif
-
-#ifdef HASATTRIBUTE
-#  define PERL_UNUSED_DECL __attribute__((unused))
-#else
-#  define PERL_UNUSED_DECL
-#endif    
-
-#ifndef dNOOP
-#  define dNOOP extern int Perl___notused PERL_UNUSED_DECL
-#endif
-
 #ifndef START_MY_CXT
 
 /*