Mercurial > hg > xemacs-beta
comparison src/glyphs-x.c @ 138:6608ceec7cf8 r20-2b3
Import from CVS: tag r20-2b3
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:31:46 +0200 |
parents | 9b50b4588a93 |
children | 585fb297b004 |
comparison
equal
deleted
inserted
replaced
137:cae984061f40 | 138:6608ceec7cf8 |
---|---|
55 #include "insdel.h" | 55 #include "insdel.h" |
56 #include "opaque.h" | 56 #include "opaque.h" |
57 | 57 |
58 #include "sysfile.h" | 58 #include "sysfile.h" |
59 | 59 |
60 #ifdef HAVE_PNG | |
61 #include <png.h> | |
62 #else | |
60 #include <setjmp.h> | 63 #include <setjmp.h> |
64 #endif | |
61 | 65 |
62 #define LISP_DEVICE_TO_X_SCREEN(dev) \ | 66 #define LISP_DEVICE_TO_X_SCREEN(dev) \ |
63 XDefaultScreenOfDisplay (DEVICE_X_DISPLAY (XDEVICE (dev))) | 67 XDefaultScreenOfDisplay (DEVICE_X_DISPLAY (XDEVICE (dev))) |
64 | 68 |
65 DEFINE_IMAGE_INSTANTIATOR_FORMAT (xbm); | 69 DEFINE_IMAGE_INSTANTIATOR_FORMAT (xbm); |
1919 | 1923 |
1920 #endif /* HAVE_GIF */ | 1924 #endif /* HAVE_GIF */ |
1921 | 1925 |
1922 | 1926 |
1923 #ifdef HAVE_PNG | 1927 #ifdef HAVE_PNG |
1924 | |
1925 #include <png.h> | |
1926 | 1928 |
1927 /********************************************************************** | 1929 /********************************************************************** |
1928 * PNG * | 1930 * PNG * |
1929 **********************************************************************/ | 1931 **********************************************************************/ |
1930 static void | 1932 static void |