-
-
Notifications
You must be signed in to change notification settings - Fork 14.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Use patches from upstream issue tracker that fix most compilation issues and the configure script; and * Modify `exp_win.c` and `pty_termios.c` to build properly on Darwin.
- Loading branch information
1 parent
6215da7
commit 68d0dfd
Showing
2 changed files
with
44 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
diff -ur a/exp_win.c b/exp_win.c | ||
--- a/exp_win.c 2018-02-02 14:15:52.000000000 -0500 | ||
+++ b/exp_win.c 2023-10-10 07:47:33.082690432 -0400 | ||
@@ -39,7 +39,8 @@ | ||
/* Sigh. On AIX 2.3, termios.h exists but does not define TIOCGWINSZ */ | ||
/* Instead, it has to come from ioctl.h. However, As I said above, this */ | ||
/* can't be cavalierly included on all machines, even when it exists. */ | ||
-#if defined(HAVE_TERMIOS) && !defined(HAVE_TIOCGWINSZ_IN_TERMIOS_H) | ||
+/* Darwin also has termios.h, but it requires ioctl.h for `ioctl`. */ | ||
+#if defined(HAVE_TERMIOS) && (defined(__APPLE__) || !defined(HAVE_TIOCGWINSZ_IN_TERMIOS_H)) | ||
# include <sys/ioctl.h> | ||
#endif | ||
|
||
diff -ur d/pty_termios.c c/pty_termios.c | ||
--- d/pty_termios.c 2023-10-10 07:59:23.244452442 -0400 | ||
+++ c/pty_termios.c 2023-10-10 08:00:35.303231582 -0400 | ||
@@ -7,7 +7,13 @@ | ||
|
||
*/ | ||
|
||
-#include <pty.h> /* openpty */ | ||
+/* openpty */ | ||
+#ifdef __APPLE__ | ||
+#include <util.h> | ||
+#else /* pty.h is Linux-specific */ | ||
+#include <pty.h> | ||
+#endif | ||
+ | ||
#include <stdio.h> | ||
#include <signal.h> | ||
|