1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-05 22:43:24 +00:00
freebsd-ports/audio/speak_freely/files/patch-ac

70 lines
1.8 KiB
Plaintext
Raw Normal View History

--- mike.c.orig Tue Sep 14 08:27:51 1999
+++ mike.c Fri Dec 31 15:29:10 1999
@@ -132,8 +132,8 @@
#endif /* UNIX420 */
#ifdef UNIX5
-#include <termio.h>
-static struct termio old_term_params;
+#include <termios.h>
+static struct termios old_term_params;
#endif /* UNIX5 */
/* Set raw mode on terminal file. Basically, get the terminal into a
@@ -152,16 +152,16 @@
#endif /* UNIX420 */
#ifdef UNIX5
- struct termio term_params;
+ struct termios term_params;
- ioctl(fileno(stdin), TCGETA, &old_term_params);
+ tcgetattr(fileno(stdin), &old_term_params);
term_params = old_term_params;
term_params.c_iflag &= ~(ICRNL|IXON|IXOFF); /* no cr translation */
term_params.c_iflag &= ~(ISTRIP); /* no stripping of high order bit */
term_params.c_oflag &= ~(OPOST); /* no output processing */
term_params.c_lflag &= ~(ISIG|ICANON|ECHO); /* raw mode */
term_params.c_cc[4] = 1; /* satisfy read after 1 char */
- ioctl(fileno(stdin), TCSETAF, &term_params);
+ tcsetattr(fileno(stdin), TCSAFLUSH, &term_params);
#endif /* UNIX5 */
/*printf("\n(raw)\n");*/
}
@@ -180,7 +180,7 @@
#endif /* UNIX420 */
#ifdef UNIX5
- ioctl(fileno(stdin), TCSETAF, &old_term_params);
+ tcsetattr(fileno(stdin), TCSAFLUSH, &old_term_params);
#endif /* UNIX5 */
/*printf("\n(cooked)\n");*/
}
@@ -1144,7 +1144,7 @@
/* SENDFILE -- Send a file or, if the file name is NULL or a
single period, send real-time sound input. */
-static int sendfile(f)
+static int sfsendfile(f)
char *f;
{
soundbuf netbuf;
@@ -2306,7 +2306,7 @@
return 1;
}
} else {
- int ok = sendfile(op);
+ int ok = sfsendfile(op);
if (ok != 0)
return ok;
sentfile++;
@@ -2318,7 +2318,7 @@
usage();
} else {
if (sentfile == 0) {
- return sendfile(NULL);
+ return sfsendfile(NULL);
}
}