Patchwork [VMS/committed] : Do not define __size_t on VMS

login
register
mail settings
Submitter Tristan Gingold
Date March 12, 2012, 8:50 a.m.
Message ID <19DE60FF-DF06-46FD-BC52-7606953E48B4@adacore.com>
Download mbox | patch
Permalink /patch/146048/
State New
Headers show

Comments

Tristan Gingold - March 12, 2012, 8:50 a.m.
On Mar 9, 2012, at 6:22 PM, Joseph S. Myers wrote:

> On Fri, 9 Mar 2012, Tristan Gingold wrote:
> 
>> as it is already defined and used by the system headers.
>> 
>> No regressions for x86_64-darwin after full bootstrap.
>> 
>> Tristan.
>> 
>> 2012-03-09  Tristan Gingold  <gingold@adacore.com>
>> 
>> 	* ginclude/stddef.h: Do not define __size_t on VMS.
> 
> Sorry, this patch is wrong.  The identifier "VMS" is in the user's 
> namespace and users on non-VMS platforms must be able to define it as a 
> macro without affecting how stddef.h behaves.  Please change this to test 
> a macro in the implementation namespace instead.

Thank you for catching that.  Fixed with:

2012-03-12  Tristan Gingold  <gingold@adacore.com>

	* ginclude/stddef.h: Adjust previous patch.  Use __VMS__ instead
	of VMS.

Patch

Index: gcc/ginclude/stddef.h
===================================================================
--- gcc/ginclude/stddef.h	(revision 185212)
+++ gcc/ginclude/stddef.h	(working copy)
@@ -203,7 +203,7 @@ 
 #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
   || defined(__FreeBSD_kernel__)
 /* __size_t is a typedef on FreeBSD 5, must not trash it. */
-#elif defined (VMS)
+#elif defined (__VMS__)
 /* __size_t is also a typedef on VMS.  */
 #else
 #define __size_t