summaryrefslogtreecommitdiffstats
path: root/libssh/channels.c
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2009-08-12 00:04:30 +0200
committerAris Adamantiadis <aris@0xbadc0de.be>2009-08-12 00:04:30 +0200
commit86418bfbbe2d6afcd630f93d5858f2d3353e12f9 (patch)
treef7e06b71df755e454cf8b5a8a20795288733867c /libssh/channels.c
parent1e1c13f756287e14ff37b6410ef29c67494c830b (diff)
parentdb284d60b97bbee864d88737b4f8c6ae5b03c8ff (diff)
downloadlibssh-86418bfbbe2d6afcd630f93d5858f2d3353e12f9.tar.gz
libssh-86418bfbbe2d6afcd630f93d5858f2d3353e12f9.tar.xz
libssh-86418bfbbe2d6afcd630f93d5858f2d3353e12f9.zip
Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh
Diffstat (limited to 'libssh/channels.c')
-rw-r--r--libssh/channels.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libssh/channels.c b/libssh/channels.c
index c603d7a..c006d24 100644
--- a/libssh/channels.c
+++ b/libssh/channels.c
@@ -1335,6 +1335,7 @@ error:
return rc;
}
+#ifndef _WIN32
/**
* @brief Accept an X11 forwarding channel.
*
@@ -1372,6 +1373,7 @@ ssh_channel channel_accept_x11(ssh_channel channel, int timeout_ms) {
return NULL;
}
+#endif
/**
* @brief Set environement variables.