Author: svn-role Date: Sat Apr 11 04:00:44 2015 New Revision: 1672810 URL: http://svn.apache.org/r1672810 Log: Merge r1670353 from trunk:
* r1670353 In the SVN_VA_NULL macro, make the implementation type private. Justification: No need to be public, so keep the API and its public documentation smaller. Votes: +1: julianfoad, stefan2, danielsh Modified: subversion/branches/1.9.x/ (props changed) subversion/branches/1.9.x/STATUS subversion/branches/1.9.x/subversion/include/svn_types.h Propchange: subversion/branches/1.9.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Apr 11 04:00:44 2015 @@ -89,4 +89,4 @@ /subversion/branches/verify-at-commit:1462039-1462408 /subversion/branches/verify-keep-going:1439280-1546110 /subversion/branches/wc-collate-path:1402685-1480384 -/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665318,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667941,1667976,1668598,1668600,1668602-1668603,1668618,1669749,1670329,1671388,1672728 +/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665318,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667941,1667976,1668598,1668600,1668602-1668603,1668618,1669749,1670329,1670353,1671388,1672728 Modified: subversion/branches/1.9.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1672810&r1=1672809&r2=1672810&view=diff ============================================================================== --- subversion/branches/1.9.x/STATUS (original) +++ subversion/branches/1.9.x/STATUS Sat Apr 11 04:00:44 2015 @@ -252,12 +252,3 @@ Veto-blocked changes: Approved changes: ================= - - * r1670353 - In the SVN_VA_NULL macro, make the implementation type private. - Justification: - No need to be public, so keep the API and its public documentation - smaller. - Votes: - +1: julianfoad, stefan2, danielsh - Modified: subversion/branches/1.9.x/subversion/include/svn_types.h URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/include/svn_types.h?rev=1672810&r1=1672809&r2=1672810&view=diff ============================================================================== --- subversion/branches/1.9.x/subversion/include/svn_types.h (original) +++ subversion/branches/1.9.x/subversion/include/svn_types.h Sat Apr 11 04:00:44 2015 @@ -150,17 +150,22 @@ typedef int svn_boolean_t; -/** Declaration of the null pointer constant type. +/* Declaration of a unique type, never defined, for the SVN_VA_NULL macro. * - * @since New in 1.9. + * NOTE: Private. Not for direct use by third-party code. */ -struct svn_null_pointer_constant_stdarg_sentinel_t; +struct svn__null_pointer_constant_stdarg_sentinel_t; /** Null pointer constant used as a sentinel in variable argument lists. * + * Use of this macro ensures that the argument is of the correct size when a + * pointer is expected. (The macro @c NULL is not defined as a pointer on + * all systems, and the arguments to variadic functions are not converted + * automatically to the expected type.) + * * @since New in 1.9. */ -#define SVN_VA_NULL ((struct svn_null_pointer_constant_stdarg_sentinel_t*)0) +#define SVN_VA_NULL ((struct svn__null_pointer_constant_stdarg_sentinel_t*)0) /* See? (char*)NULL -- They have the same length, but the cast looks ugly. */