[xine-cvs] HG: gxine: Fix HAL-related build failure on unhandled OSes.

[Darren S. <li...@yo...>]

# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1327628503 0
# Node ID cee237838b0f3f308bb40e6ea46164743ef1773e
# Branch  default
# Parent  75e28ebb6a5d8563403a77065fd27698c73c6c11
Fix HAL-related build failure on unhandled OSes.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 0.5.907: 2012-??-??
 	* Fix compilation with that nice stable API in libmozjs. This time
 	  it's a jsval change in Firefox 9 which is to blame.
+	* Fix a build failure which occurs when how to retrieve certain HAL
+	  properties isn't known. (Observed on Debian hurd-i386.)
 
 0.5.906: 2011-08-11
 	* Reset pointer shape on stream stop/eject.
 --git a/src/preferences.c b/src/preferences.c
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -474,8 +474,12 @@
 
   return get_hal_property (buf, "block.device", "storage.model")
 	 ? : get_hal_property (buf, "block.device", "info.product")
+#ifdef HAL_DEVICE_FILE_PROPERTY
 	 ? : get_hal_property (buf_unprefixed, HAL_DEVICE_FILE_PROPERTY, "info.product")
+#else
 	 /* FIXME - BSD etc. */
+	 ? : NULL
+#endif
 	 ;
 }
 #endif /* WITH_HAL */