From: Hans U. N. <hu...@us...> - 2005-04-29 22:40:43
|
Update of /cvsroot/gphoto/libgphoto2/libgphoto2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24444/libgphoto2 Modified Files: gphoto2-abilities-list.c gphoto2-camera.c Log Message: Fix source files to compile with the shipped convenience libltdl. HAVE_LTDL is only defined if we are using the system libltdl, so we cannot use it for conditionally either including ltdl.h or printing an error message. Index: gphoto2-abilities-list.c =================================================================== RCS file: /cvsroot/gphoto/libgphoto2/libgphoto2/gphoto2-abilities-list.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- gphoto2-abilities-list.c 24 Apr 2005 09:21:20 -0000 1.46 +++ gphoto2-abilities-list.c 29 Apr 2005 22:40:31 -0000 1.47 @@ -25,11 +25,7 @@ #include <stdio.h> #include <string.h> -#ifdef HAVE_LTDL -# include <ltdl.h> -#else -# error libltdl required! -#endif +#include <ltdl.h> #include "gphoto2-result.h" #include "gphoto2-port-log.h" Index: gphoto2-camera.c =================================================================== RCS file: /cvsroot/gphoto/libgphoto2/libgphoto2/gphoto2-camera.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- gphoto2-camera.c 15 Apr 2005 18:09:31 -0000 1.69 +++ gphoto2-camera.c 29 Apr 2005 22:40:32 -0000 1.70 @@ -29,11 +29,7 @@ #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_LTDL -# include <ltdl.h> -#else -# error libltdl required! -#endif +#include <ltdl.h> #include "gphoto2-context.h" #include "gphoto2-result.h" |