avoid loading both XSLoader and DynaLoader (avoids dl_error()

[p5sagit/p5-mst-13.2.git] / perl.h

diff --git a/perl.h b/perl.h
index 6ee2c0c..2f30218 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -151,14 +151,6 @@ functions are now member functions of the PERL_OBJECT.
 
 */
 
-#ifndef NEXT30_NO_ATTRIBUTE
-#  ifndef HASATTRIBUTE       /* disable GNU-cc attribute checking? */
-#    ifdef  __attribute__      /* Avoid possible redefinition errors */
-#      undef  __attribute__
-#    endif
-#    define __attribute__(attr)
-#  endif
-#endif
 
 class CPerlObj;
 
@@ -229,7 +221,7 @@ struct perl_thread;
 #endif
 
 #define NOOP (void)0
-#define dNOOP extern int __attribute__ ((unused)) Perl___notused
+#define dNOOP extern int Perl___notused
 
 #ifndef pTHX
 #  define pTHX         void
@@ -1660,7 +1652,7 @@ typedef pthread_key_t     perl_key;
 #ifdef VMS
 #   define STATUS_NATIVE       PL_statusvalue_vms
 #   define STATUS_NATIVE_EXPORT \
-       ((I32)PL_statusvalue_vms == -1 ? 44 : PL_statusvalue_vms)
+       (((I32)PL_statusvalue_vms == -1 ? 44 : PL_statusvalue_vms) | (VMSISH_HUSHED ? 0x10000000 : 0))
 #   define STATUS_NATIVE_SET(n)                                                \
        STMT_START {                                                    \
            PL_statusvalue_vms = (n);                                   \
@@ -2679,6 +2671,15 @@ typedef void *Thread;
 #  define PERL_CALLCONV
 #endif 
 
+#ifndef NEXT30_NO_ATTRIBUTE
+#  ifndef HASATTRIBUTE       /* disable GNU-cc attribute checking? */
+#    ifdef  __attribute__      /* Avoid possible redefinition errors */
+#      undef  __attribute__
+#    endif
+#    define __attribute__(attr)
+#  endif
+#endif
+
 #ifdef PERL_OBJECT
 #  define PERL_DECL_PROT
 #endif