Mercurial > emacs
comparison src/image.c @ 112347:67bea318ed68
Merge from emacs-23 branch, up to r100386.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Mon, 17 Jan 2011 18:49:59 -0800 |
| parents | 56d3e9c28eb0 7c2cdabbc4a9 |
| children | f8d0e2476a39 |
comparison
equal
deleted
inserted
replaced
| 112342:c22f11c3d8ba | 112347:67bea318ed68 |
|---|---|
| 8799 #endif /* HAVE_GHOSTSCRIPT */ | 8799 #endif /* HAVE_GHOSTSCRIPT */ |
| 8800 | 8800 |
| 8801 #ifdef HAVE_NTGUI | 8801 #ifdef HAVE_NTGUI |
| 8802 Qlibpng_version = intern_c_string ("libpng-version"); | 8802 Qlibpng_version = intern_c_string ("libpng-version"); |
| 8803 staticpro (&Qlibpng_version); | 8803 staticpro (&Qlibpng_version); |
| 8804 Fset (Qlibpng_version, | |
| 8804 #if HAVE_PNG | 8805 #if HAVE_PNG |
| 8805 SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (PNG_LIBPNG_VER)); | 8806 make_number (PNG_LIBPNG_VER) |
| 8806 #else | 8807 #else |
| 8807 SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (-1)); | 8808 make_number (-1) |
| 8808 #endif | 8809 #endif |
| 8810 ); | |
| 8809 #endif | 8811 #endif |
| 8810 | 8812 |
| 8811 #if defined (HAVE_XPM) || defined (HAVE_NS) | 8813 #if defined (HAVE_XPM) || defined (HAVE_NS) |
| 8812 Qxpm = intern_c_string ("xpm"); | 8814 Qxpm = intern_c_string ("xpm"); |
| 8813 staticpro (&Qxpm); | 8815 staticpro (&Qxpm); |