Macro conflict in gdb/opencl-lang.c

Macro conflict in gdb/opencl-lang.c

[Vladimir Simonov]

Hi all,

gdb-weekly-CVS-7.2.50.20110125
gdb/opencl-lang.c
  1119: #define STRINGIFY(S) #S

Macro STRINGIFY conflicts with
mingw64 internal include:
include64/_mingw_mac.h
/**
* This file has no copyright assigned and is placed in the Public Domain.
* This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER within this package.
*/

#ifndef _INC_CRTDEFS_MACRO
#define _INC_CRTDEFS_MACRO

#define __STRINGIFY(x) #x
#define STRINGIFY(x) __STRINGIFY(x)

Could somebody having write access resolve this
in gdb/opencl-lang.c as obvious?

Regards
Vladimir Simonov

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

[Ulrich Weigand]

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

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

[Joel Brobecker]

> > Macro STRINGIFY conflicts with
> > mingw64 internal include:
> 
> That's a bit unfortunate, such includes shouldn't really
> intrude on the user namespace ...

What I don't understand is why I am not seeing the problem...
I've just successfully rebuilt GDB on x64 Windows, and the include
in question does have the STRINGIFY macro.

> ChangeLog:
> 
> 	* opencl-lang.c (STRINGIFY): Rename to OCL_STRING.
> 	(BUILD_OCL_VTYPES): Update.

Thanks for taking care of the problem, though.


-- 
Joel

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

[Vladimir Simonov]

On 02/02/2011 05:07 PM, Joel Brobecker wrote:
>>> Macro STRINGIFY conflicts with
>>> mingw64 internal include:
>>
>> That's a bit unfortunate, such includes shouldn't really
>> intrude on the user namespace ...
>
> What I don't understand is why I am not seeing the problem...
> I've just successfully rebuilt GDB on x64 Windows, and the include
> in question does have the STRINGIFY macro.
>
>> ChangeLog:
>>
>> 	* opencl-lang.c (STRINGIFY): Rename to OCL_STRING.
>> 	(BUILD_OCL_VTYPES): Update.
>
> Thanks for taking care of the problem, though.
>
>

Looks like my mingw a bit old - mingw-w64-snapshot-20090419
The current one doesn't have a problem:
mingw-w64-v1.0-20101003/mingw-w64-headers/include/ChangeLog
2009-12-04  Jonathan Yong  <jon_y@users.sourceforge.net>

         * _mingw_mac.h (STRINGIFY): Rename to __MINGW64_STRINGIFY
         (__MINGW64_VERSION_STR): Use __MINGW64_STRINGIFY

Ulrich, thank you for fix.

Best regards
Vladimir Simonov