diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-16 09:37:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-16 09:43:48 +0200 |
| commit | 00eae6f01bf11ec6a90dfc68e607b6a1a250a118 (patch) | |
| tree | b814d518076840b7433d02bc3b5957c1dd54de25 /xorg-server/glx/singlesize.h | |
| parent | a50d2ee664302147942dd5ed6428f9bab9d4e76a (diff) | |
| parent | d6d3999ccb2cb72d55820770260172eccbbb68d7 (diff) | |
| download | vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.gz vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.bz2 vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/securitysrv.h
xorg-server/glx/glxext.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_size_get.c
xorg-server/hw/xwin/winclip.c
xorg-server/hw/xwin/winfont.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmonitors.h
xorg-server/include/closestr.h
xorg-server/include/pixmapstr.h
xorg-server/include/servermd.h
xorg-server/include/site.h
xorg-server/include/windowstr.h
xorg-server/include/xkbstr.h
Diffstat (limited to 'xorg-server/glx/singlesize.h')
| -rw-r--r-- | xorg-server/glx/singlesize.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/glx/singlesize.h b/xorg-server/glx/singlesize.h index 78826dfb0..dc85d3d36 100644 --- a/xorg-server/glx/singlesize.h +++ b/xorg-server/glx/singlesize.h @@ -38,7 +38,7 @@ #include "indirect_size.h" extern GLint __glReadPixels_size(GLenum format, GLenum type, - GLint width, GLint height); + GLint width, GLint height); extern GLint __glGetMap_size(GLenum pname, GLenum query); extern GLint __glGetMapdv_size(GLenum target, GLenum query); extern GLint __glGetMapfv_size(GLenum target, GLenum query); @@ -48,7 +48,7 @@ extern GLint __glGetPixelMapfv_size(GLenum map); extern GLint __glGetPixelMapuiv_size(GLenum map); extern GLint __glGetPixelMapusv_size(GLenum map); extern GLint __glGetTexImage_size(GLenum target, GLint level, GLenum format, - GLenum type, GLint width, GLint height, - GLint depth); + GLenum type, GLint width, GLint height, + GLint depth); -#endif /* _singlesize_h_ */ +#endif /* _singlesize_h_ */ |