diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-25 07:59:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-25 07:59:24 +0000 |
| commit | cc136e24f9b68f3c4114fad31ed0230ff45a89f4 (patch) | |
| tree | 973ebeba3165eb093e4d83651abf6dcdf472f4cd /xorg-server | |
| parent | fd5b58eccdd9405ae0ebce6ca5222e92d3c6688d (diff) | |
| download | vcxsrv-cc136e24f9b68f3c4114fad31ed0230ff45a89f4.tar.gz vcxsrv-cc136e24f9b68f3c4114fad31ed0230ff45a89f4.tar.bz2 vcxsrv-cc136e24f9b68f3c4114fad31ed0230ff45a89f4.zip | |
Removed compiler warnings.
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/Xext/sync.c | 4 | ||||
| -rw-r--r-- | xorg-server/Xi/exevents.c | 4 | ||||
| -rw-r--r-- | xorg-server/os/xstrans.c | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/xorg-server/Xext/sync.c b/xorg-server/Xext/sync.c index 667f8ab78..bb5931582 100644 --- a/xorg-server/Xext/sync.c +++ b/xorg-server/Xext/sync.c @@ -1095,6 +1095,10 @@ FreeAwait(void *addr, XID id) return Success; } +#ifdef _MSC_VER +#pragma warning(disable:4715) /* Not all control paths return a value */ +#endif + /* loosely based on dix/events.c/OtherClientGone */ static int FreeAlarmClient(void *value, XID id) diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c index 8729d129b..52a0fe3e6 100644 --- a/xorg-server/Xi/exevents.c +++ b/xorg-server/Xi/exevents.c @@ -1690,6 +1690,10 @@ RecalculateDeviceDeliverableEvents(WindowPtr pWin) }
}
+#ifdef _MSC_VER
+#pragma warning(disable:4715) /* Not all control paths return a value */
+#endif
+
int
InputClientGone(WindowPtr pWin, XID id)
{
diff --git a/xorg-server/os/xstrans.c b/xorg-server/os/xstrans.c index 86c8688da..dd75ab53e 100644 --- a/xorg-server/os/xstrans.c +++ b/xorg-server/os/xstrans.c @@ -5,6 +5,8 @@ #define TRANS_REOPEN #define TRANS_SERVER #define XSERV_t +#ifndef TCPCONN #define TCPCONN +#endif #include <X11/Xtrans/transport.c> |