x11proto: Changes to 'master'

[Alan Coopersmith]

 Xfuncproto.h.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c76d51423d6a6afe4f0c8fc6f863ba97d202184b
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Aug 26 14:36:50 2012 -0700

    Bug 51009: _X_RESTRICT_KYWD fix for g++ 4.6 & later on Solaris
    
    g++ 4.6 & later on Solaris set the __STDC_VERSION__ define to indicate
    C99 mode to expose C99/Unix03 functions in the system headers, even
    though they don't recognize the C99 restrict keyword, as explained in
    http://gcc.gnu.org/ml/gcc-patches/2010-05/msg01308.html
    
    Thus we avoid using the restrict keyword here if __cplusplus is also
    defined, falling back to the __GNUC__ case using __restrict__ instead.
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=51009
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Tested-by: Jonathan Perkin