diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-27 13:04:40 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-27 13:04:40 +0000 |
| commit | 9691d196c34d551ebc33843692afd0ee23b9389b (patch) | |
| tree | 184412bc028d5e4b62492d4c95a899b35e600692 /xorg-server/mi/miinitext.c | |
| parent | f49a8c2a1f02f8089d709ec8dcf7080c041baf0c (diff) | |
| download | vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.tar.gz vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.tar.bz2 vcxsrv-9691d196c34d551ebc33843692afd0ee23b9389b.zip | |
svn merge -r549:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/mi/miinitext.c')
| -rw-r--r-- | xorg-server/mi/miinitext.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xorg-server/mi/miinitext.c b/xorg-server/mi/miinitext.c index 3d4b2ba6f..778e77734 100644 --- a/xorg-server/mi/miinitext.c +++ b/xorg-server/mi/miinitext.c @@ -540,8 +540,7 @@ InitExtensions(int argc, char *argv[]) for (i = 0; ExtensionModuleList[i].name != NULL; i++) { ext = &ExtensionModuleList[i]; if (ext->initFunc != NULL && - (ext->disablePtr == NULL || - (ext->disablePtr != NULL && !*ext->disablePtr))) { + (ext->disablePtr == NULL || !*ext->disablePtr)) { (ext->initFunc)(); } } |