summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <teuf@gnome.org>2005-11-08 09:08:02 +0000
committerChristophe Fergeau <teuf@gnome.org>2005-11-08 09:08:02 +0000
commitbf46e1695894bba62a06e8e22f4cca29f7ae033a (patch)
treeb19b2e86964386bfb7053fa04c22bdf9d2fa7f30
parentceb4e16403677caf3bd5548108d458ca42349663 (diff)
downloadlibgpod-tmz-bf46e1695894bba62a06e8e22f4cca29f7ae033a.tar.gz
libgpod-tmz-bf46e1695894bba62a06e8e22f4cca29f7ae033a.tar.xz
libgpod-tmz-bf46e1695894bba62a06e8e22f4cca29f7ae033a.zip
2005-11-08 Christophe Fergeau <teuf@gnome.org>
* src/hal-common.c: * src/hal-common.h: more #if => #ifdef changes git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1145 f01d2545-417e-4e96-918e-98f8d0dbbcb6
-rw-r--r--ChangeLog5
-rw-r--r--src/hal-common.c4
-rw-r--r--src/hal-common.h2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 93a9407..996627a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-11-08 Christophe Fergeau <teuf@gnome.org>
+ * src/hal-common.c:
+ * src/hal-common.h: more #if => #ifdef changes
+
+2005-11-08 Christophe Fergeau <teuf@gnome.org>
+
* src/ipod-device.c:
* src/ipod-device.h: update comments to reflect the fact we are using
#ifdef HAVE_LIBHAL instead of #if HAVE_LIBHAL now
diff --git a/src/hal-common.c b/src/hal-common.c
index 6b36d6f..0e731b6 100644
--- a/src/hal-common.c
+++ b/src/hal-common.c
@@ -17,7 +17,7 @@
|
| The following changes were done:
|
-| - libhal becomes optional (see #if HAVE_LIBHAL sections)
+| - libhal becomes optional (see #ifdef HAVE_LIBHAL sections)
| - provide some dummy libhal functions to make libhal-independence
| of ipod-device.c easier.
|
@@ -58,7 +58,7 @@
#include "hal-common.h"
-#if HAVE_LIBHAL
+#ifdef HAVE_LIBHAL
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
diff --git a/src/hal-common.h b/src/hal-common.h
index db525fa..cd78cc4 100644
--- a/src/hal-common.h
+++ b/src/hal-common.h
@@ -62,7 +62,7 @@
#include <glib.h>
#include <glib-object.h>
-#if HAVE_LIBHAL
+#ifdef HAVE_LIBHAL
#include <libhal.h>
#include <dbus/dbus.h>