From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Fri, 26 Oct 2001 02:07:17 +0000 (+0000)
Subject: Integrate change #12664 from maintperl;
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=39c19e8a5eaa38b8223e4575bddb6696efd1e9b2;p=p5sagit%2Fp5-mst-13.2.git

Integrate change #12664 from maintperl;

the newest GCCs don't seem to like C<"string1"##STRING2>
so keep it as C<"string1" STRING2> (latter appears to
work everywhere)

p4raw-link: @12664 on //depot/maint-5.6/perl: 607cda642ea5296498be6c3d456d2b4311d99342

p4raw-id: //depot/perl@12666
p4raw-integrated: from //depot/maint-5.6/perl@12665 'merge in'
	ext/DynaLoader/dlutils.c (@12653..)
---

diff --git a/ext/DynaLoader/dlutils.c b/ext/DynaLoader/dlutils.c
index f15cf73..620d31b 100644
--- a/ext/DynaLoader/dlutils.c
+++ b/ext/DynaLoader/dlutils.c
@@ -11,7 +11,7 @@
 #ifndef XS_VERSION
 #  define XS_VERSION "0"
 #endif
-#define MY_CXT_KEY "DynaLoader::_guts"##XS_VERSION
+#define MY_CXT_KEY "DynaLoader::_guts" XS_VERSION
 
 typedef struct {
     char *	x_dl_last_error;	/* pointer to allocated memory for