Tweak the insertion of __attribute__((nonnull())) declarations

in proto.h so it compiles with and without threads with gcc 3.4

p4raw-id: //depot/perl@24416

1 files changed, 17 insertions, 2 deletions

diff --git a/embed.pl b/embed.pl
index 39bd4296da..6487ff4ae0 100755
--- a/embed.pl
+++ b/embed.pl
@@ -212,8 +212,23 @@ sub write_protos {
 	}
 	$ret .= "\n\t\t\t__attribute__((nonnull))" if $flags =~ /N/;
 	if ( @nonnull ) {
-	    my @pos = map { $has_context ? "pTHX_ $_" : $_ } @nonnull;
-	    $ret .= sprintf( "\n\t\t\t__attribute__((nonnull(%s)))", join( ",", @pos ) );
+	    if ($has_context) {
+		my @pos = map { $has_context ? $_ + 1 : $_ } @nonnull;
+		$ret .= sprintf( <<ATTR,
+
+#ifdef USE_ITHREADS
+			__attribute__((nonnull(%s)))
+#else
+			__attribute__((nonnull(%s)))
+#endif
+ATTR
+		    join( ",", @pos ),
+		    join( ",", @nonnull ),
+		);
+	    }
+	    else {
+		$ret .= sprintf( "\n\t\t\t__attribute__((nonnull(%s)))", join( ",", @nonnull ) );
+	    }
 	}
 	$ret .= ";";
 	$ret .= ' */' if $flags =~ /m/;