Merge from emacs-24; up to 117689

[gnu-emacs] / src / w32inevt.h

diff --git a/src/w32inevt.h b/src/w32inevt.h
index 319688b877bffc19e76cd565c9edaf4506b879d7..c4836211bc9946ebf499f61003675ee7c38840f6 100644 (file)
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -1,5 +1,5 @@
 /* Input routines for GNU Emacs on the Microsoft Windows API.
-   Copyright (C) 1995, 2001-2012  Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2014 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -23,10 +23,10 @@ extern int w32_console_unicode_input;
 
 extern int w32_console_read_socket (struct terminal *term,
                                    struct input_event *hold_quit);
-extern void w32_console_mouse_position (FRAME_PTR *f, int insist,
+extern void w32_console_mouse_position (struct frame **f, int insist,
                                        Lisp_Object *bar_window,
                                        enum scroll_bar_part *part,
                                        Lisp_Object *x, Lisp_Object *y,
-                                       unsigned long *time);
+                                       Time *time);
 
 #endif /* EMACS_W32INEVT_H */