Backport of long term bug from trunk:

2008-07-18  David Robinow  <drobinow@gmail.com>  (tiny change)

        * w32inevt.c: Include dispextern.h.  Don't declare change_frame_size
        here.
        (maybe_generate_resize_event, resize_event): Call change_frame_size
        with SAFE arg.

2 files changed, 10 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e1c93051548..5604f8080d0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-18  David Robinow  <drobinow@gmail.com>  (tiny change)
+
+        * w32inevt.c: Include dispextern.h.  Don't declare change_frame_size
+        here.
+        (maybe_generate_resize_event, resize_event): Call change_frame_size
+        with SAFE arg.
+
 2008-07-17  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * gtkutil.c: Include <config.h> instead of "config.h".
diff --git a/src/w32inevt.c b/src/w32inevt.c
index 0eb73964aae..6f0401c9561 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -39,6 +39,7 @@ Boston, MA 02110-1301, USA.
 #include "lisp.h"
 #include "keyboard.h"
 #include "frame.h"
+#include "dispextern.h"
 #include "blockinput.h"
 #include "termhooks.h"
 #include "w32heap.h"
@@ -54,9 +55,6 @@ static DWORD movement_time;
 /* from keyboard.c */
 extern void reinvoke_input_signal (void);
 
-/* from dispnew.c */
-extern int change_frame_size (FRAME_PTR, int, int, int, int);
-
 /* from w32console.c */
 extern int w32_use_full_screen_buffer;
 
@@ -622,7 +620,7 @@ resize_event (WINDOW_BUFFER_SIZE_RECORD *event)
 {
   FRAME_PTR f = get_frame ();
 
-  change_frame_size (f, event->dwSize.Y, event->dwSize.X, 0, 1);
+  change_frame_size (f, event->dwSize.Y, event->dwSize.X, 0, 1, 0);
   SET_FRAME_GARBAGED (f);
 }
 
@@ -639,7 +637,7 @@ maybe_generate_resize_event ()
   change_frame_size (f,
                      1 + info.srWindow.Bottom - info.srWindow.Top,
                      1 + info.srWindow.Right - info.srWindow.Left,
-                     0, 0);
+                     0, 0, 0);
 }
 
 int