diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-26 20:19:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-26 20:19:23 +0100 |
| commit | 5f455179ae4b279a82d99a7a3dabe61f58c42ad6 (patch) | |
| tree | fdecec022cf1b8b782b90a64c14e374fa6d400cb /libxcb/src | |
| parent | 78d84bd03c744b0ed420c450dd2807904ccaef21 (diff) | |
| parent | 30af30b78075159fce477ae99cc72540133714d0 (diff) | |
| download | vcxsrv-5f455179ae4b279a82d99a7a3dabe61f58c42ad6.tar.gz vcxsrv-5f455179ae4b279a82d99a7a3dabe61f58c42ad6.tar.bz2 vcxsrv-5f455179ae4b279a82d99a7a3dabe61f58c42ad6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver randrproto libxtrans fontconfig libxcb xcb-proto mesa git update 26 Jan 2014
Conflicts:
X11/xtrans/Xtrans.c
xorg-server/dix/dispatch.c
xorg-server/os/xdmcp.c
Diffstat (limited to 'libxcb/src')
| -rw-r--r-- | libxcb/src/c_client.py | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/libxcb/src/c_client.py b/libxcb/src/c_client.py index 8217029e9..794501a5d 100644 --- a/libxcb/src/c_client.py +++ b/libxcb/src/c_client.py @@ -982,15 +982,22 @@ def _c_serialize_helper_fields(context, self, # fields with variable size else: - # switch/bitcase: always calculate padding before and after variable sized fields - if need_padding or is_bitcase: + if field.type.is_pad: + # Variable length pad is <pad align= /> + code_lines.append('%s xcb_align_to = %d;' % (space, field.type.align)) count += _c_serialize_helper_insert_padding(context, code_lines, space, + self.var_followed_by_fixed_fields) + continue + else: + # switch/bitcase: always calculate padding before and after variable sized fields + if need_padding or is_bitcase: + count += _c_serialize_helper_insert_padding(context, code_lines, space, self.var_followed_by_fixed_fields) - value, length = _c_serialize_helper_fields_variable_size(context, self, field, - code_lines, temp_vars, - space, prefix) - prev_field_was_variable = True + value, length = _c_serialize_helper_fields_variable_size(context, self, field, + code_lines, temp_vars, + space, prefix) + prev_field_was_variable = True # save (un)serialization C code if '' != value: @@ -1741,10 +1748,11 @@ def _c_accessors(self, name, base): # else: if True: for field in self.fields: - if field.type.is_list and not field.type.fixed_size(): - _c_accessors_list(self, field) - elif field.prev_varsized_field is not None or not field.type.fixed_size(): - _c_accessors_field(self, field) + if not field.type.is_pad: + if field.type.is_list and not field.type.fixed_size(): + _c_accessors_list(self, field) + elif field.prev_varsized_field is not None or not field.type.fixed_size(): + _c_accessors_field(self, field) def c_simple(self, name): ''' |