Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/src/image.c Mon Jan 17 18:35:23 2011 -0800 +++ b/src/image.c Mon Jan 17 18:49:59 2011 -0800 @@ -8801,11 +8801,13 @@ #ifdef HAVE_NTGUI Qlibpng_version = intern_c_string ("libpng-version"); staticpro (&Qlibpng_version); + Fset (Qlibpng_version, #if HAVE_PNG - SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (PNG_LIBPNG_VER)); + make_number (PNG_LIBPNG_VER) #else - SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (-1)); + make_number (-1) #endif + ); #endif #if defined (HAVE_XPM) || defined (HAVE_NS)