summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Src/Modules/zpty.c10
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e51b23754..8c461c760 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-17  Tanaka Akira  <akr@zsh.org>
+
+	* 11426: Src/Modules/zpty.c: don't use #elif.
+
 2000-05-16  Tanaka Akira  <akr@zsh.org>
 
 	* 11420: Src/Modules/zpty.c: try more pty device files.
diff --git a/Src/Modules/zpty.c b/Src/Modules/zpty.c
index a0897b828..dd15a1d2d 100644
--- a/Src/Modules/zpty.c
+++ b/Src/Modules/zpty.c
@@ -213,16 +213,18 @@ static int
 get_pty(int master, int *retfd)
 {
 
-#if defined(__linux)
+#ifdef __linux
     static char char1[] = "abcdefghijklmnopqrstuvwxyz";
     static char char2[] = "0123456789abcdef";
-#elif defined(__FreeBSD__)
+#else /* __linux */
+# ifdef __FreeBSD__
     static char char1[] = "pqrsPQRS";
     static char char2[] = "0123456789abcdefghijklmnopqrstuv";
-#else
+# else /* __FreeBSD__ */
     static char char1[] = "pqrstuvwxyzPQRST";
     static char char2[] = "0123456789abcdef";
-#endif
+# endif /* __FreeBSD__ */
+#endif /* __linux */
 
     static char name[11];
     static int mfd, sfd;