term.c does not needto include sudo.h

diff --git a/src/Makefile.in b/src/Makefile.in
index a83a7176f3b193e95436f87221d6c9fad4252e60..89020dee8e537eb6e5a17f5a93011ca512b3394a 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -145,7 +145,7 @@ sudo_edit.o: $(srcdir)/sudo_edit.c $(SUDODEP)
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_edit.c
 sudo_noexec.o: $(srcdir)/sudo_noexec.c $(incdir)/compat.h $(top_builddir)/config.h
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c
-term.o: $(srcdir)/term.c $(SUDODEP)
+term.o: $(srcdir)/term.c $(incdir)/compat.h $(top_builddir)/config.h
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/term.c
 tgetpass.o: $(srcdir)/tgetpass.c $(SUDODEP)
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/tgetpass.c

diff --git a/src/term.c b/src/term.c
index 993f53fd9405b44aa85c9f8654bf35a17c923e21..6e7f614f746cc9a3188d3202db7e9aacd4fe431d 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 2010 Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -43,7 +43,7 @@
 # include <termio.h>
 #endif /* HAVE_TERMIOS_H */
 
-#include "sudo.h"
+#include "compat.h"
 
 #ifndef TCSASOFT
 # define TCSASOFT      0
@@ -80,9 +80,7 @@
 # define TCSADRAIN             TCSETAW
 #endif /* HAVE_TERMIOS_H */
 
-typedef struct termios sudo_term_t;
-
-static sudo_term_t term, oterm;
+static struct termios term, oterm;
 static int changed;
 int term_erase;
 int term_kill;