X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Ftoolbar-msw.c;h=c5a0778608899842b1fa50acaa4878ce7a6ed5dc;hp=5a4acfd7c412750260f974b79c133e73d31c8e0e;hb=2bf45e07013c281a55bc509b24f5e83568f3d0fd;hpb=ea1ea793fe6e244ef5555ed983423a204101af13

diff --git a/src/toolbar-msw.c b/src/toolbar-msw.c
index 5a4acfd..c5a0778 100644
--- a/src/toolbar-msw.c
+++ b/src/toolbar-msw.c
@@ -262,7 +262,7 @@ mswindows_output_toolbar (struct frame *f, enum toolbar_pos pos)
 	      
 	      if (IMAGE_INSTANCEP (instance))
 		{
-		  struct Lisp_Image_Instance* p = XIMAGE_INSTANCE (instance);
+		  Lisp_Image_Instance* p = XIMAGE_INSTANCE (instance);
 		  
 		  if (IMAGE_INSTANCE_PIXMAP_TYPE_P (p))
 		    {
@@ -573,9 +573,10 @@ static void
 mswindows_free_frame_toolbars (struct frame *f)
 {
   HWND twnd=NULL;
-#define DELETE_TOOLBAR(pos) \
-  mswindows_clear_toolbar(f, 0, pos); \
-  if ((twnd=GetDlgItem(FRAME_MSWINDOWS_HANDLE(f), TOOLBAR_ID_BIAS + pos))) \
+#define DELETE_TOOLBAR(pos)				\
+  mswindows_clear_toolbar(f, pos, 0);			\
+  if ((twnd=GetDlgItem(FRAME_MSWINDOWS_HANDLE(f),	\
+		       TOOLBAR_ID_BIAS + pos)))		\
       DestroyWindow(twnd)
 
   DELETE_TOOLBAR(TOP_TOOLBAR);
@@ -586,7 +587,7 @@ mswindows_free_frame_toolbars (struct frame *f)
 }
 
 /* map toolbar hwnd to pos*/
-int mswindows_find_toolbar_pos(struct frame* f, HWND ctrl)
+static int mswindows_find_toolbar_pos(struct frame* f, HWND ctrl)
 {
   int id = GetDlgCtrlID(ctrl);
   return id ? id - TOOLBAR_ID_BIAS : -1;