Author: benny Date: 2007-01-08 16:44:42 +0000 (Mon, 08 Jan 2007) New Revision: 24315
Modified: libexo/trunk/ChangeLog libexo/trunk/configure.in.in libexo/trunk/exo-hal/exo-hal.c Log: 2007-01-08 Benedikt Meurer <[EMAIL PROTECTED]> * configure.in.in, exo-hal/exo-hal.c: Fix build with older HAL versions. Fix build on amd64. Bug #2725. Modified: libexo/trunk/ChangeLog =================================================================== --- libexo/trunk/ChangeLog 2007-01-08 15:16:47 UTC (rev 24314) +++ libexo/trunk/ChangeLog 2007-01-08 16:44:42 UTC (rev 24315) @@ -1,3 +1,8 @@ +2007-01-08 Benedikt Meurer <[EMAIL PROTECTED]> + + * configure.in.in, exo-hal/exo-hal.c: Fix build with older HAL + versions. Fix build on amd64. Bug #2725. + 2007-01-07 Benedikt Meurer <[EMAIL PROTECTED]> * exo-mount/exo-mount-hal.c: Handle blank discs properly. Try to come Modified: libexo/trunk/configure.in.in =================================================================== --- libexo/trunk/configure.in.in 2007-01-08 15:16:47 UTC (rev 24314) +++ libexo/trunk/configure.in.in 2007-01-08 16:44:42 UTC (rev 24315) @@ -154,6 +154,23 @@ if test x"$HAL_FOUND" = x"yes"; then dnl # substituted into exo-hal-0.3.pc HAL_STORAGE_DEPENDENCY="hal-storage" + + dnl # Check if LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL is declared + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $HAL_CFLAGS" + AC_MSG_CHECKING([whether LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL is declared]) + AC_COMPILE_IFELSE(AC_LANG_SOURCE( + [#include <libhal-storage.h> + int main (int argc, char **argv) { return LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL; } + ]), + [ + AC_DEFINE([HAVE_LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL], [1], [Define if LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL present]) + AC_MSG_RESULT([yes]) + ], + [ + AC_MSG_RESULT([no]) + ]) + CFLAGS="$save_CFLAGS" fi AC_SUBST([HAL_STORAGE_DEPENDENCY]) Modified: libexo/trunk/exo-hal/exo-hal.c =================================================================== --- libexo/trunk/exo-hal/exo-hal.c 2007-01-08 15:16:47 UTC (rev 24314) +++ libexo/trunk/exo-hal/exo-hal.c 2007-01-08 16:44:42 UTC (rev 24315) @@ -310,7 +310,11 @@ else if ((cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDRW) != 0 && (cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRW) != 0) { - if ((cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL) != 0 || (cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL) != 0) + if ((cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL) != 0 +#ifdef HAVE_LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL + || (cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL) != 0 +#endif + ) second = "/DVD±RW DL"; else second = "/DVD±RW"; @@ -694,7 +698,7 @@ if (G_LIKELY (size < n * 10)) size_string = g_strdup_printf ("%.01f%c", ((gdouble) size) / ((gdouble) m), UNITS[n]); else - size_string = g_strdup_printf ("%lld%c", size / m, UNITS[n]); + size_string = g_strdup_printf ("%llu%c", size / m, UNITS[n]); break; } } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits