diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-28 19:34:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-28 19:34:41 +0000 |
| commit | fedd99993946dd8fc22b60e3611e447f3b8092ca (patch) | |
| tree | f1486f18c003876c504227d5c2fc602371524aba /xorg-server/hw/xwin/InitOutput.c | |
| parent | 94399647b31b4d87cc009954dd213475993a9011 (diff) | |
| parent | 1ad46cbf3a9963f3d6d8c687480a80d359ec15f8 (diff) | |
| download | vcxsrv-fedd99993946dd8fc22b60e3611e447f3b8092ca.tar.gz vcxsrv-fedd99993946dd8fc22b60e3611e447f3b8092ca.tar.bz2 vcxsrv-fedd99993946dd8fc22b60e3611e447f3b8092ca.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xwin/InitOutput.c')
| -rw-r--r-- | xorg-server/hw/xwin/InitOutput.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c index d05a76320..d86711100 100644 --- a/xorg-server/hw/xwin/InitOutput.c +++ b/xorg-server/hw/xwin/InitOutput.c @@ -1,3 +1,4 @@ +
/*
Copyright 1993, 1998 The Open Group
@@ -359,11 +360,11 @@ winCheckMount(void) continue;
level = curlevel;
- if ((winCheckMntOpt(ent, "binary") == NULL) ||
+ if ((winCheckMntOpt(ent, "binary") == NULL) &&
(winCheckMntOpt(ent, "binmode") == NULL))
- binary = 0;
+ binary = FALSE;
else
- binary = 1;
+ binary = TRUE;
}
if (endmntent(mnt) != 1)
|