aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2003-01-30 07:21:10 +0000
committerJuanma Barranquero2003-01-30 07:21:10 +0000
commit100dcd40b8240c5ddb3c7b1984409e0c5440347e (patch)
treed4ee43d4f780bb4fbfaed2d87ef80c5e4cfd82bc /src
parentfbd852aff7310eff7703b15229027f330ae07aee (diff)
downloademacs-100dcd40b8240c5ddb3c7b1984409e0c5440347e.tar.gz
emacs-100dcd40b8240c5ddb3c7b1984409e0c5440347e.zip
(init_external_image_libraries): Add missing operator.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32fns.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 20ff83542d6..6be247431fb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12003-01-30 Juanma Barranquero <lektu@terra.es>
2
3 * w32fns.c (init_external_image_libraries): Add missing operator.
4
12003-01-29 Jason Rumney <jasonr@gnu.org> 52003-01-29 Jason Rumney <jasonr@gnu.org>
2 6
3 * w32fns.c (init_external_image_libraries): Allow jpeg-62.dll as 7 * w32fns.c (init_external_image_libraries): Allow jpeg-62.dll as
diff --git a/src/w32fns.c b/src/w32fns.c
index 4af4555dd93..7d8044085b9 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -15681,7 +15681,7 @@ init_external_image_libraries ()
15681#if HAVE_JPEG 15681#if HAVE_JPEG
15682 /* Try loading jpeg library under probable names. */ 15682 /* Try loading jpeg library under probable names. */
15683 if ((library = LoadLibrary ("libjpeg.dll")) 15683 if ((library = LoadLibrary ("libjpeg.dll"))
15684 (library = LoadLibrary ("jpeg-62.dll")) 15684 || (library = LoadLibrary ("jpeg-62.dll"))
15685 || (library = LoadLibrary ("jpeg.dll"))) 15685 || (library = LoadLibrary ("jpeg.dll")))
15686 { 15686 {
15687 if (init_jpeg_functions (library)) 15687 if (init_jpeg_functions (library))