From: "Ulrich Weigand" <uweigand@de.ibm.com>
To: sv@sw.ru (Vladimir Simonov), gdb-patches@sourceware.org
Cc: gdb@sourceware.org
Subject: [commit] Rename STRINGIFY (Re: Macro conflict in gdb/opencl-lang.c)
Date: Wed, 02 Feb 2011 13:50:00 -0000 [thread overview]
Message-ID: <201102021349.p12DnnJl016545@d06av02.portsmouth.uk.ibm.com> (raw)
In-Reply-To: <4D483FE0.70700@sw.ru> from "Vladimir Simonov" at Feb 01, 2011 08:16:16 PM
Vladimir Simonov wrote:
> Macro STRINGIFY conflicts with
> mingw64 internal include:
That's a bit unfortunate, such includes shouldn't really
intrude on the user namespace ...
Anyway, I've now checked in the following patch.
Bye,
Ulrich
ChangeLog:
* opencl-lang.c (STRINGIFY): Rename to OCL_STRING.
(BUILD_OCL_VTYPES): Update.
Index: gdb/opencl-lang.c
===================================================================
RCS file: /cvs/src/src/gdb/opencl-lang.c,v
retrieving revision 1.4
diff -u -p -r1.4 opencl-lang.c
--- gdb/opencl-lang.c 10 Jan 2011 20:38:49 -0000 1.4
+++ gdb/opencl-lang.c 2 Feb 2011 13:42:20 -0000
@@ -1116,27 +1116,27 @@ build_opencl_types (struct gdbarch *gdba
= GDBARCH_OBSTACK_ZALLOC (gdbarch, struct builtin_opencl_type);
/* Helper macro to create strings. */
-#define STRINGIFY(S) #S
+#define OCL_STRING(S) #S
/* This macro allocates and assigns the type struct pointers
for the vector types. */
#define BUILD_OCL_VTYPES(TYPE)\
builtin_opencl_type->builtin_##TYPE##2\
= init_vector_type (builtin_opencl_type->builtin_##TYPE, 2);\
- TYPE_NAME (builtin_opencl_type->builtin_##TYPE##2) = STRINGIFY(TYPE ## 2);\
+ TYPE_NAME (builtin_opencl_type->builtin_##TYPE##2) = OCL_STRING(TYPE ## 2);\
builtin_opencl_type->builtin_##TYPE##3\
= init_vector_type (builtin_opencl_type->builtin_##TYPE, 3);\
- TYPE_NAME (builtin_opencl_type->builtin_##TYPE##3) = STRINGIFY(TYPE ## 3);\
+ TYPE_NAME (builtin_opencl_type->builtin_##TYPE##3) = OCL_STRING(TYPE ## 3);\
TYPE_LENGTH (builtin_opencl_type->builtin_##TYPE##3)\
= 4 * TYPE_LENGTH (builtin_opencl_type->builtin_##TYPE);\
builtin_opencl_type->builtin_##TYPE##4\
= init_vector_type (builtin_opencl_type->builtin_##TYPE, 4);\
- TYPE_NAME (builtin_opencl_type->builtin_##TYPE##4) = STRINGIFY(TYPE ## 4);\
+ TYPE_NAME (builtin_opencl_type->builtin_##TYPE##4) = OCL_STRING(TYPE ## 4);\
builtin_opencl_type->builtin_##TYPE##8\
= init_vector_type (builtin_opencl_type->builtin_##TYPE, 8);\
- TYPE_NAME (builtin_opencl_type->builtin_##TYPE##8) = STRINGIFY(TYPE ## 8);\
+ TYPE_NAME (builtin_opencl_type->builtin_##TYPE##8) = OCL_STRING(TYPE ## 8);\
builtin_opencl_type->builtin_##TYPE##16\
= init_vector_type (builtin_opencl_type->builtin_##TYPE, 16);\
- TYPE_NAME (builtin_opencl_type->builtin_##TYPE##16) = STRINGIFY(TYPE ## 16)
+ TYPE_NAME (builtin_opencl_type->builtin_##TYPE##16) = OCL_STRING(TYPE ## 16)
builtin_opencl_type->builtin_char
= arch_integer_type (gdbarch, 8, 0, "char");
--
Dr. Ulrich Weigand
GNU Toolchain for Linux on System z and Cell BE
Ulrich.Weigand@de.ibm.com
next parent reply other threads:[~2011-02-02 13:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4D483FE0.70700@sw.ru>
2011-02-02 13:50 ` Ulrich Weigand [this message]
2011-02-02 14:07 ` Joel Brobecker
2011-02-02 14:59 ` Vladimir Simonov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201102021349.p12DnnJl016545@d06av02.portsmouth.uk.ibm.com \
--to=uweigand@de.ibm.com \
--cc=gdb-patches@sourceware.org \
--cc=gdb@sourceware.org \
--cc=sv@sw.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox