diff options
| author | Joakim Verona | 2013-08-27 06:36:29 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-27 06:36:29 +0200 |
| commit | d5ac6cccbe97aabd7b8d324aaae3716eb9853cb1 (patch) | |
| tree | e64deeb8c1e7001cab68753aa3bf0358c6340748 /src/image.c | |
| parent | 9d1c69140689c3efe53e50b01fe5d7f1d020277e (diff) | |
| parent | d350e350eaf4872d123e0ab873c4a095099013c9 (diff) | |
| download | emacs-d5ac6cccbe97aabd7b8d324aaae3716eb9853cb1.tar.gz emacs-d5ac6cccbe97aabd7b8d324aaae3716eb9853cb1.zip | |
merge from trunk
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/image.c b/src/image.c index 59347161576..8d9c33de12c 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -563,7 +563,6 @@ static void x_emboss (struct frame *, struct image *); | |||
| 563 | static void x_build_heuristic_mask (struct frame *, struct image *, | 563 | static void x_build_heuristic_mask (struct frame *, struct image *, |
| 564 | Lisp_Object); | 564 | Lisp_Object); |
| 565 | #ifdef WINDOWSNT | 565 | #ifdef WINDOWSNT |
| 566 | extern Lisp_Object Vlibrary_cache; | ||
| 567 | #define CACHE_IMAGE_TYPE(type, status) \ | 566 | #define CACHE_IMAGE_TYPE(type, status) \ |
| 568 | do { Vlibrary_cache = Fcons (Fcons (type, status), Vlibrary_cache); } while (0) | 567 | do { Vlibrary_cache = Fcons (Fcons (type, status), Vlibrary_cache); } while (0) |
| 569 | #else | 568 | #else |