This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[commit] Rename STRINGIFY (Re: Macro conflict in gdb/opencl-lang.c)


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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]