Mercurial > emacs
changeset 52008:66104cf372d8
Consider both png.h and libpng/png.h.
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Tue, 22 Jul 2003 17:31:33 +0000 |
| parents | 43cb913ddeef |
| children | a9d461b0fc6f |
| files | src/xfns.c |
| diffstat | 1 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfns.c Tue Jul 22 17:29:56 2003 +0000 +++ b/src/xfns.c Tue Jul 22 17:31:33 2003 +0000 @@ -1935,11 +1935,11 @@ managers which don't support that encoding. So, if NAME contains only ASCII and 8859-1 characters, encode it by iso-latin-1, and use "STRING" in text.encoding hoping that - such window manager at least analize this format correctly, + such window managers at least analyze this format correctly, i.e. treat 8-bit bytes as 8859-1 characters. We may also be able to use "UTF8_STRING" in text.encoding - in the feature which can encode all Unicode characters. + in the future which can encode all Unicode characters. But, for the moment, there's no way to know that the current window manager supports it or not. */ coding_system = Qcompound_text; @@ -7565,7 +7565,13 @@ #if HAVE_PNG -#include <libpng/png.h> +#ifdef HAVE_PNG_H +# include <png.h> +#else +# ifdef HAVE_LIBPNG_PNG_H +# include <libpng/png.h> +# endif +#endif /* Function prototypes. */