From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17041 invoked by alias); 2 Feb 2011 13:50:01 -0000 Received: (qmail 17023 invoked by uid 22791); 2 Feb 2011 13:49:59 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,MSGID_FROM_MTA_HEADER,SPF_SOFTFAIL,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mtagate6.uk.ibm.com (HELO mtagate6.uk.ibm.com) (194.196.100.166) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 02 Feb 2011 13:49:54 +0000 Received: from d06nrmr1707.portsmouth.uk.ibm.com (d06nrmr1707.portsmouth.uk.ibm.com [9.149.39.225]) by mtagate6.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p12DnovO008774; Wed, 2 Feb 2011 13:49:50 GMT Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p12Dnr9j1937662; Wed, 2 Feb 2011 13:49:53 GMT Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p12DnoP7016586; Wed, 2 Feb 2011 06:49:50 -0700 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id p12DnnJl016545; Wed, 2 Feb 2011 06:49:49 -0700 Message-Id: <201102021349.p12DnnJl016545@d06av02.portsmouth.uk.ibm.com> Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Wed, 02 Feb 2011 14:49:49 +0100 Subject: [commit] Rename STRINGIFY (Re: Macro conflict in gdb/opencl-lang.c) To: sv@sw.ru (Vladimir Simonov), gdb-patches@sourceware.org Date: Wed, 02 Feb 2011 13:50:00 -0000 From: "Ulrich Weigand" Cc: gdb@sourceware.org In-Reply-To: <4D483FE0.70700@sw.ru> from "Vladimir Simonov" at Feb 01, 2011 08:16:16 PM MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-02/txt/msg00013.txt.bz2 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