X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.pl;h=27815ae9cd75804aa01c91e2eac0c9dc73c0022d;hb=2522aa67345a7f37d0050d70f341ab3a0b6165b0;hp=fd4a91718f79f6f53cdc26e59d7d960b9de524c6;hpb=37442d52629699d89ef62d315d35efbc0facec21;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/embed.pl b/embed.pl
index fd4a917..27815ae 100755
--- a/embed.pl
+++ b/embed.pl
@@ -204,17 +204,17 @@ sub write_protos {
 	$ret .= ")";
 	my @attrs;
 	if ( $flags =~ /r/ ) {
-	    push @attrs, "__attribute__((noreturn))";
+	    push @attrs, "__attribute__noreturn__";
 	}
 	if ( $flags =~ /a/ ) {
-	    push @attrs, "__attribute__((malloc))";
+	    push @attrs, "__attribute__malloc__";
 	    $flags .= "R"; # All allocing must check return value
 	}
 	if ( $flags =~ /R/ ) {
-	    push @attrs, "__attribute__((warn_unused_result))";
+	    push @attrs, "__attribute__warn_unused_result__";
 	}
 	if ( $flags =~ /P/ ) {
-	    push @attrs, "__attribute__((pure))";
+	    push @attrs, "__attribute__pure__";
 	}
 	if( $flags =~ /f/ ) {
 	    my $prefix = $has_context ? 'pTHX_' : '';
@@ -224,7 +224,7 @@ sub write_protos {
 	}
 	if ( @nonnull ) {
 	    my @pos = map { $has_context ? "pTHX_$_" : $_ } @nonnull;
-	    push @attrs, sprintf( "__attribute__((nonnull(%s)))", join( ",", @pos ) );
+	    push @attrs, map { sprintf( "__attribute__nonnull__(%s)", $_ ) } @pos;
 	}
 	if ( @attrs ) {
 	    $ret .= "\n";
@@ -794,10 +794,27 @@ EXTCONST void * const PL_force_link_funcs[] = {
 #define PERLVARIC(v,t,i) PERLVAR(v,t)
 #define PERLVARISC(v,i) PERLVAR(v,char)
 
+/* In Tru64 (__DEC && __osf__) the cc option -std1 causes that one
+ * cannot cast between void pointers and function pointers without
+ * info level warnings.  The PL_force_link_funcs[] would cause a few
+ * hundred of those warnings.  In code one can circumnavigate this by using
+ * unions that overlay the different pointers, but in declarations one
+ * cannot use this trick.  Therefore we just disable the warning here
+ * for the duration of the PL_force_link_funcs[] declaration. */
+
+#if defined(__DECC) && defined(__osf__)
+#pragma message save
+#pragma message disable (nonstandcast)
+#endif
+
 #include "thrdvar.h"
 #include "intrpvar.h"
 #include "perlvars.h"
 
+#if defined(__DECC) && defined(__osf__)
+#pragma message restore
+#endif
+
 #undef PERLVAR
 #undef PERLVARA
 #undef PERLVARI