From: Juanma Barranquero Date: Thu, 30 Jan 2003 07:21:10 +0000 (+0000) Subject: (init_external_image_libraries): Add missing operator. X-Git-Tag: ttn-vms-21-2-B4~11411 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=100dcd40b8240c5ddb3c7b1984409e0c5440347e;p=emacs.git (init_external_image_libraries): Add missing operator. --- diff --git a/src/ChangeLog b/src/ChangeLog index 20ff83542d6..6be247431fb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2003-01-30 Juanma Barranquero + + * w32fns.c (init_external_image_libraries): Add missing operator. + 2003-01-29 Jason Rumney * 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 () #if HAVE_JPEG /* Try loading jpeg library under probable names. */ if ((library = LoadLibrary ("libjpeg.dll")) - (library = LoadLibrary ("jpeg-62.dll")) + || (library = LoadLibrary ("jpeg-62.dll")) || (library = LoadLibrary ("jpeg.dll"))) { if (init_jpeg_functions (library))