X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fconsole-msw.h;h=59a6033d30428588421aceeed2ed2ef4fcfb9c8b;hp=7d637468f5da34a6039d389ee5ce4d677b499f3e;hb=c3cd708891dd33d498fa622524622fb097034479;hpb=3f6ecf401c01c83743af2c1e068f57e8d2e2e410

diff --git a/src/console-msw.h b/src/console-msw.h
index 7d63746..59a6033 100644
--- a/src/console-msw.h
+++ b/src/console-msw.h
@@ -273,8 +273,8 @@ struct msprinter_frame
 #define FRAME_MSPRINTER_BOTTOM_MARGIN(f) (FRAME_MSPRINTER_DATA (f)->bottom_margin)
 #define FRAME_MSPRINTER_JOB_STARTED(f)	 (FRAME_MSPRINTER_DATA (f)->job_started)
 #define FRAME_MSPRINTER_PAGE_STARTED(f)	 (FRAME_MSPRINTER_DATA (f)->page_started)
-#define FRAME_MSPRINTER_CHARWIDTH(f)	 (FRAME_MSPRINTER_DATA (f)->charheight)
-#define FRAME_MSPRINTER_CHARHEIGHT(f)	 (FRAME_MSPRINTER_DATA (f)->charwidth)
+#define FRAME_MSPRINTER_CHARWIDTH(f)	 (FRAME_MSPRINTER_DATA (f)->charwidth)
+#define FRAME_MSPRINTER_CHARHEIGHT(f)	 (FRAME_MSPRINTER_DATA (f)->charheight)
 #define FRAME_MSPRINTER_PIXLEFT(f)	 (FRAME_MSPRINTER_DATA (f)->pix_left)
 #define FRAME_MSPRINTER_PIXTOP(f)	 (FRAME_MSPRINTER_DATA (f)->pix_top)
 
@@ -342,6 +342,8 @@ USID emacs_mswindows_delete_stream_pair (Lisp_Object instream,
 HANDLE get_nt_process_handle (Lisp_Process *p);
 #endif
 
+void mswindows_unwait_process (Lisp_Process *p);
+
 extern Lisp_Object Vmswindows_frame_being_created;
 extern Lisp_Object mswindows_frame_being_created;
 
@@ -376,8 +378,6 @@ Lisp_Object mswindows_handle_print_dialog_box (struct frame *f,
 					       Lisp_Object keys);
 Lisp_Object mswindows_handle_page_setup_dialog_box (struct frame *f,
 						    Lisp_Object keys);
-Lisp_Object mswindows_handle_print_setup_dialog_box (struct frame *f,
-						     Lisp_Object keys);
 int mswindows_get_default_margin (Lisp_Object prop);
 
 void mswindows_register_popup_frame (Lisp_Object frame);