[foo-cvs] fooelk/lib/xlib color.c, 1.1.1.1, 1.2 display.c, 1.1.1.1, 1.2 gcontext.c, 1.1.1.1, 1.2

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/fooelk/lib/xlib
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7414/lib/xlib

Modified Files:
	color.c display.c gcontext.c 
Log Message:
equiv to revision level r270 of original elk

Index: display.c
===================================================================
RCS file: /cvsroot/foo/fooelk/lib/xlib/display.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** display.c	6 Aug 2004 20:56:43 -0000	1.1.1.1
--- display.c	26 Apr 2010 15:31:55 -0000	1.2
***************
*** 44,48 ****
  static int Display_Print (Object d, Object port,
                            int raw, int depth, int length) {
!     Printf (port, "#[display %lu %s]", (unsigned)DISPLAY(d)->dpy,
          DisplayString (DISPLAY(d)->dpy));
      return 0;
--- 44,49 ----
  static int Display_Print (Object d, Object port,
                            int raw, int depth, int length) {
!     Printf (port, "#[display %lu %s]",
!         (unsigned long)(uintptr_t)DISPLAY(d)->dpy,
          DisplayString (DISPLAY(d)->dpy));
      return 0;

Index: color.c
===================================================================
RCS file: /cvsroot/foo/fooelk/lib/xlib/color.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** color.c	6 Aug 2004 20:56:43 -0000	1.1.1.1
--- color.c	26 Apr 2010 15:31:55 -0000	1.2
***************
*** 38,42 ****
  }
  
! Generic_Print (Color, "#[color %lu]", POINTER(x))
  
  Object Make_Color (unsigned int r, unsigned int g, unsigned int b) {
--- 38,42 ----
  }
  
! Generic_Print (Color, "#[color %lu]", (unsigned int)(uintptr_t)POINTER(x))
  
  Object Make_Color (unsigned int r, unsigned int g, unsigned int b) {

Index: gcontext.c
===================================================================
RCS file: /cvsroot/foo/fooelk/lib/xlib/gcontext.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gcontext.c	6 Aug 2004 20:56:43 -0000	1.1.1.1
--- gcontext.c	26 Apr 2010 15:31:55 -0000	1.2
***************
*** 37,41 ****
  Generic_Equal_Dpy (Gc, GCONTEXT, gc)
  
! Generic_Print (Gc, "#[gcontext %lu]", GCONTEXT(x)->gc)
  
  Generic_Get_Display (Gc, GCONTEXT)
--- 37,41 ----
  Generic_Equal_Dpy (Gc, GCONTEXT, gc)
  
! Generic_Print (Gc, "#[gcontext %lu]", (unsigned int)(uintptr_t)GCONTEXT(x)->gc)
  
  Generic_Get_Display (Gc, GCONTEXT)