diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-08-31 15:09:02 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-08-31 15:09:02 +0100 |
| commit | 8724bb25c325f4a03f36389d553b00f87930ced9 (patch) | |
| tree | d2b505c5966f0a0d01732a56bb07f940548e0d99 /include | |
| parent | cad2feacb52c7e38236db39df06c3fc11ba3aae1 (diff) | |
| parent | dfc03ef3fda3572db590c2096272c990d434163e (diff) | |
Merge tag 'xorg-server-1.12.4' into cygwin-release-1.12xserver-cygwin-1.12.4-1cygwin-release-1.12
xorg-server-1.12.4
Conflicts:
glx/glxcmds.c
hw/xfree86/modes/xf86Crtc.c
os/utils.c
pseudoramiX/pseudoramiX.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/list.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/list.h b/include/list.h index 96c0bcbd6..d54a207b1 100644 --- a/include/list.h +++ b/include/list.h @@ -453,7 +453,7 @@ xorg_list_is_empty(struct xorg_list *head) #define nt_list_del(_entry, _list, _type, _member) \ do { \ _type *__e = _entry; \ - if (__e == NULL) break; \ + if (__e == NULL || _list == NULL) break; \ if ((_list) == __e) { \ _list = __e->_member; \ } else { \ |