Merge from emacs--devo--0

[gnu-emacs] / src / w32inevt.h

diff --git a/src/w32inevt.h b/src/w32inevt.h
index f0f7f232261f928927287ead3c6e24ec84b58a26..08d85a0b2e4f28f800588d4ac79faf82e8c1eaaa 100644 (file)
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -22,7 +22,7 @@ Boston, MA 02110-1301, USA.  */
 #ifndef EMACS_W32INEVT_H
 #define EMACS_W32INEVT_H
 
-extern int w32_console_read_socket (int sd, int numchars,
+extern int w32_console_read_socket (struct terminal *term, int numchars,
                                    struct input_event *hold_quit);
 extern void w32_console_mouse_position (FRAME_PTR *f, int insist,
                                        Lisp_Object *bar_window,