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/indirect_table.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/indirect_table.h')
| -rw-r--r-- | xorg-server/glx/indirect_table.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/glx/indirect_table.h b/xorg-server/glx/indirect_table.h index 4af1ccbea..a39dc4e3d 100644 --- a/xorg-server/glx/indirect_table.h +++ b/xorg-server/glx/indirect_table.h @@ -45,8 +45,8 @@ struct __glXDispatchInfo { /** */ - const int_fast16_t * dispatch_tree; - + const int_fast16_t *dispatch_tree; + /** * Array of protocol decode and dispatch functions index by the opcode * search tree (i.e., \c dispatch_tree). The first element in each pair @@ -70,7 +70,7 @@ struct __glXDispatchInfo { * If size checking is not to be performed on this type of protocol * data, this pointer will be \c NULL. */ - const int_fast16_t (*size_table)[2]; + const int_fast16_t(*size_table)[2]; /** * Array of functions used to calculate the variable-size portion of @@ -103,4 +103,4 @@ extern const struct __glXDispatchInfo Single_dispatch_info; extern const struct __glXDispatchInfo Render_dispatch_info; extern const struct __glXDispatchInfo VendorPriv_dispatch_info; -#endif /* INDIRECT_TABLE_H */ +#endif /* INDIRECT_TABLE_H */ |