From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 20 Oct 2011 09:02:27 +0000 (+0100)
Subject: Fix virFileOpenTty definition on Win32
X-Git-Tag: v0.9.7-rc1~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=646b30077363801370e1a2f0ebff94e8e95d69e0;p=thirdparty%2Flibvirt.git

Fix virFileOpenTty definition on Win32

Stub out a complete impl of virFileOpenTty to avoid unused
parameter warnings

* src/util/util.c: Fix virFileOpenTty on Win32
---

diff --git a/src/util/util.c b/src/util/util.c
index 01146f5a02..af2734486e 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -1099,20 +1099,13 @@ virFileBuildPath(const char *dir, const char *name, const char *ext)
     return path;
 }
 
-
+#ifndef WIN32
 int virFileOpenTty(int *ttymaster,
                    char **ttyName,
                    int rawmode)
 {
     int rc = -1;
 
-#ifdef WIN32
-    /* mingw completely lacks pseudo-terminals, and the gnulib
-     * replacements are not (yet) license compatible.  */
-    errno = ENOSYS;
-
-#else /* !WIN32 */
-
     if ((*ttymaster = posix_openpt(O_RDWR|O_NOCTTY|O_NONBLOCK)) < 0)
         goto cleanup;
 
@@ -1151,9 +1144,19 @@ cleanup:
     if (rc != 0)
         VIR_FORCE_CLOSE(*ttymaster);
 
-#endif /* !WIN32 */
     return rc;
 }
+#else /* WIN32 */
+int virFileOpenTty(int *ttymaster ATTRIBUTE_UNUSED,
+                   char **ttyName ATTRIBUTE_UNUSED,
+                   int rawmode ATTRIBUTE_UNUSED)
+{
+    /* mingw completely lacks pseudo-terminals, and the gnulib
+     * replacements are not (yet) license compatible.  */
+    errno = ENOSYS;
+    return -1;
+}
+#endif /* WIN32 */
 
 /*
  * Creates an absolute path for a potentially relative path.