Fix compilation errors in previous commit.

* src/callproc.c (getenv_internal): Fix get_terminal_param call.

* dispextern.h (get_device): Move declaration to termhooks.h.
* termhooks.h (get_device): Move here.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-462

3 files changed, 2 insertions, 4 deletions

diff --git a/src/callproc.c b/src/callproc.c
index 35331e4b5dd..a8735d51c9b 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1493,7 +1493,7 @@ getenv_internal (var, varlen, value, valuelen, terminal)
   /* Find the environment in which to search the variable. */
   if (!NILP (terminal))
     {
-      Lisp_Object local = get_terminal_param (get_device (terminal, 1));
+      Lisp_Object local = get_terminal_param (get_device (terminal, 1), Qenvironment);
       /* Use Vprocess_environment if there is no local environment.  */
       if (!NILP (local))
         environment = local;
diff --git a/src/dispextern.h b/src/dispextern.h
index b473f9cb16b..2ae833d46c2 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2939,8 +2939,6 @@ extern void insert_glyphs P_ ((struct frame *, struct glyph *, int));
 extern void delete_glyphs P_ ((struct frame *, int));
 extern void ins_del_lines P_ ((struct frame *, int, int));
 
-extern struct device *get_device P_ ((Lisp_Object display, int));
-
 extern struct device *init_initial_device P_ ((void));
 
 
diff --git a/src/termhooks.h b/src/termhooks.h
index f12dbadd197..7920b6597aa 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -596,7 +596,7 @@ extern struct device *device_list;
 #define DEVICE_ACTIVE_P(d) ((d)->type != output_termcap || (d)->display_info.tty->input)
 
 extern Lisp_Object get_terminal_param P_ ((struct device *, Lisp_Object));
-
+extern struct device *get_device P_ ((Lisp_Object display, int));
 extern struct device *create_device P_ ((void));
 extern void delete_device P_ ((struct device *));