From 9420758127dbcf4de83d3f4d9354e292c015f1ba Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Thu, 20 Apr 2017 19:09:07 +0100
Subject: getptmfd() and fdforkpty() compat.

---
 compat/fdforkpty.c   | 34 ++++++++++++++++++++++++++++++++++
 compat/forkpty-aix.c |  3 ++-
 compat/setenv.c      |  4 +++-
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 compat/fdforkpty.c

(limited to 'compat')

diff --git a/compat/fdforkpty.c b/compat/fdforkpty.c
new file mode 100644
index 00000000..c05f0dbf
--- /dev/null
+++ b/compat/fdforkpty.c
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+
+#include <limits.h>
+
+#include "compat.h"
+
+int
+getptmfd(void)
+{
+	return (INT_MAX);
+}
+
+pid_t
+fdforkpty(__unused int ptmfd, int *master, char *name, struct termios *tio,
+    struct winsize *ws)
+{
+	return (forkpty(master, name, tio, ws));
+}
diff --git a/compat/forkpty-aix.c b/compat/forkpty-aix.c
index 31b084db..5eba9fd6 100644
--- a/compat/forkpty-aix.c
+++ b/compat/forkpty-aix.c
@@ -29,7 +29,8 @@ void fatal(const char *, ...);
 void fatalx(const char *, ...);
 
 pid_t
-forkpty(int *master, unused char *name, struct termios *tio, struct winsize *ws)
+forkpty(int *master, __unused char *name, struct termios *tio,
+    struct winsize *ws)
 {
 	int	slave = -1, fd, pipe_fd[2];
 	char   *path, dummy;
diff --git a/compat/setenv.c b/compat/setenv.c
index 9f9295c8..d9235bcc 100644
--- a/compat/setenv.c
+++ b/compat/setenv.c
@@ -15,13 +15,15 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/types.h>
+
 #include <stdlib.h>
 #include <string.h>
 
 #include "compat.h"
 
 int
-setenv(const char *name, const char *value, unused int overwrite)
+setenv(const char *name, const char *value, __unused int overwrite)
 {
 	char	*newval;
 
-- 
cgit v1.2.3