diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-25 17:56:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-25 17:56:10 +0100 |
| commit | ba6115f56f066621a20fa545ddd67721afd35523 (patch) | |
| tree | 418b724d4f318d24dc8e5183e6b252922f85f149 /libxcb/src/c_client.py | |
| parent | eb71c0f23999d1cc156e1821d73634ec79621fc2 (diff) | |
| parent | e0927d908a12c9c140458c355b29b884a7705f2d (diff) | |
| download | vcxsrv-ba6115f56f066621a20fa545ddd67721afd35523.tar.gz vcxsrv-ba6115f56f066621a20fa545ddd67721afd35523.tar.bz2 vcxsrv-ba6115f56f066621a20fa545ddd67721afd35523.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/InitInput.c
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmsgwindow.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
Diffstat (limited to 'libxcb/src/c_client.py')
| -rw-r--r-- | libxcb/src/c_client.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libxcb/src/c_client.py b/libxcb/src/c_client.py index 9430c005a..af1337ec0 100644 --- a/libxcb/src/c_client.py +++ b/libxcb/src/c_client.py @@ -191,7 +191,7 @@ def c_open(self): _c('#define ALIGNOF(type) offsetof(struct { char dummy; type member; }, member)') if _ns.is_ext: - for (n, h) in self.imports: + for (n, h) in self.direct_imports: _hc('#include "%s.h"', h) _h('') |