[Emacs-diffs] Changes to emacs/src/macterm.h

[YAMAMOTO Mitsuharu]

Index: emacs/src/macterm.h
diff -c emacs/src/macterm.h:1.24 emacs/src/macterm.h:1.25
*** emacs/src/macterm.h:1.24    Mon Jul  4 16:06:33 2005
--- emacs/src/macterm.h Mon Jul 18 05:41:03 2005
***************
*** 149,155 ****
    int smallest_font_height;
  
    /* Reusable Graphics Context for drawing a cursor in a non-default face. */
!   XGCValues *scratch_cursor_gc;
  
    /* These variables describe the range of text currently shown in its
       mouse-face, together with the window they apply to. As long as
--- 149,155 ----
    int smallest_font_height;
  
    /* Reusable Graphics Context for drawing a cursor in a non-default face. */
!   GC scratch_cursor_gc;
  
    /* These variables describe the range of text currently shown in its
       mouse-face, together with the window they apply to. As long as
***************
*** 388,394 ****
    /* Relief GCs, colors etc.  */
    struct relief
    {
!     XGCValues *gc;
      unsigned long pixel;
      int allocated_p;
    }
--- 388,394 ----
    /* Relief GCs, colors etc.  */
    struct relief
    {
!     GC gc;
      unsigned long pixel;
      int allocated_p;
    }
***************
*** 601,606 ****
--- 601,608 ----
  EXFUN (Fx_display_grayscale_p, 1);
  EXFUN (Fx_display_planes, 1);
  extern void x_free_gcs P_ ((struct frame *));
+ extern int XParseGeometry P_ ((char *, int *, int *, unsigned int *,
+                              unsigned int *));
  
  /* Defined in macterm.c.  */
  
***************
*** 614,619 ****
--- 616,622 ----
                                               unsigned long, unsigned long,
                                               unsigned int));
  extern void XFreePixmap P_ ((Display *, Pixmap));
+ extern GC XCreateGC P_ ((Display *, Window, unsigned long, XGCValues *));
  extern void XSetForeground P_ ((Display *, GC, unsigned long));
  extern void XSetBackground P_ ((Display *, GC, unsigned long));
  extern void XSetWindowBackground P_ ((Display *, WindowPtr, unsigned long));