aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-05-05 00:23:07 -0700
committerPaul Eggert2011-05-05 00:23:07 -0700
commit4c4b566b11106e0dd4767340e6e7e0fc89cfd589 (patch)
tree337b998684108a3dd37d2fb6b612f595a30997d5 /src
parentc717b32678affe3864f0d5024a9de514c950214d (diff)
downloademacs-4c4b566b11106e0dd4767340e6e7e0fc89cfd589.tar.gz
emacs-4c4b566b11106e0dd4767340e6e7e0fc89cfd589.zip
* image.c (Finit_image_library) [!HAVE_NTGUI]: Omit unused local.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/image.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2b4f498a0b9..755b02631f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-05-05 Paul Eggert <eggert@cs.ucla.edu> 12011-05-05 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * image.c (Finit_image_library) [!HAVE_NTGUI]: Omit unused local.
4
3 * term.c (vfatal): Remove stray call to va_end. 5 * term.c (vfatal): Remove stray call to va_end.
4 It's not needed and the C Standard doesn't allow it here anyway. 6 It's not needed and the C Standard doesn't allow it here anyway.
5 7
diff --git a/src/image.c b/src/image.c
index d78b556d8c9..4e0503ac1dc 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8602,11 +8602,9 @@ Libraries to load are specified in alist LIBRARIES (usually, the value
8602of `dynamic-library-alist', which see). */) 8602of `dynamic-library-alist', which see). */)
8603 (Lisp_Object type, Lisp_Object libraries) 8603 (Lisp_Object type, Lisp_Object libraries)
8604{ 8604{
8605 Lisp_Object tested;
8606
8607#ifdef HAVE_NTGUI 8605#ifdef HAVE_NTGUI
8608 /* Don't try to reload the library. */ 8606 /* Don't try to reload the library. */
8609 tested = Fassq (type, Vlibrary_cache); 8607 Lisp_Object tested = Fassq (type, Vlibrary_cache);
8610 if (CONSP (tested)) 8608 if (CONSP (tested))
8611 return XCDR (tested); 8609 return XCDR (tested);
8612#endif 8610#endif