summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-11-03 14:51:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:23 -0500
commitf8f1d1b089d9228c1fba049cc9d38ef30030641e (patch)
treeeed3f894e7a4d437b366b8255a777ca07cc0356a
parent29697cb8c1e45bdf23c0d972b74f2da016367756 (diff)
downloadsamba-f8f1d1b089d9228c1fba049cc9d38ef30030641e.tar.gz
samba-f8f1d1b089d9228c1fba049cc9d38ef30030641e.tar.bz2
samba-f8f1d1b089d9228c1fba049cc9d38ef30030641e.zip
r3510: fix build on SuSE 9.1
metze (This used to be commit 9cc1ab4eb2d5dd42ca8261c4781dd0168954c069)
-rw-r--r--source4/lib/getsmbpass.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/source4/lib/getsmbpass.c b/source4/lib/getsmbpass.c
index b6ae09b318..0d8f4a4b7e 100644
--- a/source4/lib/getsmbpass.c
+++ b/source4/lib/getsmbpass.c
@@ -19,6 +19,8 @@ Cambridge, MA 02139, USA. */
/* Modified to use with samba by Jeremy Allison, 8th July 1995. */
#include "includes.h"
+#include "include/system/terminal.h"
+#include "include/system/wait.h"
#ifdef REPLACE_GETPASS
@@ -40,16 +42,16 @@ static struct termio t;
#define TCSANOW 0
#endif
-static int tcgetattr(int fd, struct termio *t)
+static int tcgetattr(int fd, struct termio *_t)
{
- return ioctl(fd, TCGETA, t);
+ return ioctl(fd, TCGETA, _t);
}
-static int tcsetattr(int fd, int flags, struct termio *t)
+static int tcsetattr(int fd, int flags, struct termio *_t)
{
if(flags & TCSAFLUSH)
ioctl(fd, TCFLSH, TCIOFLUSH);
- return ioctl(fd, TCSETS, t);
+ return ioctl(fd, TCSETS, _t);
}
#elif !defined(TCSAFLUSH)
@@ -65,14 +67,14 @@ static struct sgttyb t;
#define TCSAFLUSH 1
#define TCSANOW 0
-static int tcgetattr(int fd, struct sgttyb *t)
+static int tcgetattr(int fd, struct sgttyb *_t)
{
- return ioctl(fd, TIOCGETP, (char *)t);
+ return ioctl(fd, TIOCGETP, (char *)_t);
}
-static int tcsetattr(int fd, int flags, struct sgttyb *t)
+static int tcsetattr(int fd, int flags, struct sgttyb *_t)
{
- return ioctl(fd, TIOCSETP, (char *)t);
+ return ioctl(fd, TIOCSETP, (char *)_t);
}
#else /* POSIX TERMIO HANDLING */