diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2014-11-12 12:33:30 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2014-11-25 13:00:49 +0100 |
| commit | 71f156caf5fbe5ad78c9caeb44f7a25c299ceba4 (patch) | |
| tree | 2c6b85f2550a73b0e1998728edbe9794f1ccfcb3 /src/virt-viewer.c | |
| parent | 5a444f106dd869473db15fa7952f0a2ea5a09091 (diff) | |
| download | virt-viewer-71f156caf5fbe5ad78c9caeb44f7a25c299ceba4.tar.gz virt-viewer-71f156caf5fbe5ad78c9caeb44f7a25c299ceba4.tar.xz virt-viewer-71f156caf5fbe5ad78c9caeb44f7a25c299ceba4.zip | |
Limit HAVE_SOCKETPAIR to directly concerned code
Diffstat (limited to 'src/virt-viewer.c')
| -rw-r--r-- | src/virt-viewer.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/virt-viewer.c b/src/virt-viewer.c index b4691eb..329eada 100644 --- a/src/virt-viewer.c +++ b/src/virt-viewer.c @@ -465,14 +465,16 @@ virt_viewer_update_display(VirtViewer *self, virDomainPtr dom) static gboolean virt_viewer_open_connection(VirtViewerApp *self G_GNUC_UNUSED, int *fd) { -#if defined(HAVE_SOCKETPAIR) VirtViewer *viewer = VIRT_VIEWER(self); VirtViewerPrivate *priv = viewer->priv; - int pair[2]; +#if defined(HAVE_SOCKETPAIR) || defined(HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD) virErrorPtr err; #endif - *fd = -1; #if defined(HAVE_SOCKETPAIR) + int pair[2]; +#endif + *fd = -1; + if (!priv->dom) return TRUE; @@ -488,6 +490,7 @@ virt_viewer_open_connection(VirtViewerApp *self G_GNUC_UNUSED, int *fd) } #endif +#if defined(HAVE_SOCKETPAIR) if (socketpair(PF_UNIX, SOCK_STREAM, 0, pair) < 0) return FALSE; |