diff options
| author | hypnotoad <yoda@etoyoc.com> | 2016-10-02 12:07:40 (GMT) |
|---|---|---|
| committer | hypnotoad <yoda@etoyoc.com> | 2016-10-02 12:07:40 (GMT) |
| commit | 0c444bd87e7dc74b25427a5fccf08ddd8d565cd6 (patch) | |
| tree | 3afc6c9d5e73e2e86de808ce98ce275312d3dc7e /xlib | |
| parent | 20c81b194394bb6ea16d1831f6f895b63477819c (diff) | |
| parent | 6c0dafab46875ddb6dd0a91f5e056a8d87722ca6 (diff) | |
| download | tk-core_zip_vfs.zip tk-core_zip_vfs.tar.gz tk-core_zip_vfs.tar.bz2 | |
Pulling changes from trunkcore_zip_vfs
Diffstat (limited to 'xlib')
| -rw-r--r-- | xlib/X11/Xlib.h | 3 | ||||
| -rw-r--r-- | xlib/X11/Xutil.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h index 667bdc7..8d8ec68 100644 --- a/xlib/X11/Xlib.h +++ b/xlib/X11/Xlib.h @@ -330,6 +330,9 @@ typedef struct _XImage { unsigned long green_mask; unsigned long blue_mask; XPointer obdata; /* hook for the object routines to hang on */ +#if defined(MAC_OSX_TK) + int pixelpower; /* n such that pixels are 2^n x 2^n blocks*/ +#endif struct funcs { /* image manipulation routines */ struct _XImage *(*create_image)(); #if NeedFunctionPrototypes diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h index 58124b0..bf372fb 100644 --- a/xlib/X11/Xutil.h +++ b/xlib/X11/Xutil.h @@ -535,7 +535,7 @@ extern Status XMatchVisualInfo( #endif ); -extern void XOffsetRegion( +extern int XOffsetRegion( #if NeedFunctionPrototypes Region /* r */, int /* dx */, @@ -814,7 +814,7 @@ extern void XUnionRectWithRegion( #endif ); -extern void XUnionRegion( +extern int XUnionRegion( #if NeedFunctionPrototypes Region /* sra */, Region /* srb */, |