[Xfce4-commits] <xfce4-session:aliov/hal-deprecation> Use __FreeBSD__ instead of HAVE_FREEBSD which wasn't defined in config.h.
Ali Abdallah
noreply at xfce.org
Sun Jan 31 19:58:01 CET 2010
Updating branch refs/heads/aliov/hal-deprecation
to 3726f8974829715ec65a5a473285d8ff5afc1ef3 (commit)
from 35e939a7ee6a064720c55496fb6732530aa33c6b (commit)
commit 3726f8974829715ec65a5a473285d8ff5afc1ef3
Author: Ali Abdallah <aliov at xfce.org>
Date: Sun Jan 31 19:53:42 2010 +0100
Use __FreeBSD__ instead of HAVE_FREEBSD which wasn't defined in config.h.
xfce4-session/xfsm-shutdown-helper.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/xfce4-session/xfsm-shutdown-helper.c b/xfce4-session/xfsm-shutdown-helper.c
index e7ededf..536efbe 100644
--- a/xfce4-session/xfsm-shutdown-helper.c
+++ b/xfce4-session/xfsm-shutdown-helper.c
@@ -177,7 +177,7 @@ G_DEFINE_TYPE (XfsmShutdownHelper, xfsm_shutdown_helper, G_TYPE_OBJECT)
#ifdef ENABLE_POLKIT
-#ifdef HAVE_FREEBSD
+#if defined(__FreeBSD__)
/**
* Taken from polkitunixprocess.c code to get process start
* time from pid.
@@ -202,13 +202,13 @@ get_kinfo_proc (pid_t pid, struct kinfo_proc *p)
return TRUE;
}
-#endif
+#endif /*if defined(__FreeBSD__)*/
static guint64
get_start_time_for_pid (pid_t pid)
{
guint64 start_time;
-#ifndef HAVE_FREEBSD
+#if !defined(__FreeBSD__)
gchar *filename;
gchar *contents;
size_t length;
@@ -264,7 +264,9 @@ get_start_time_for_pid (pid_t pid)
out:
g_free (filename);
g_free (contents);
-#else
+
+#else /*if !defined(__FreeBSD__)*/
+
struct kinfo_proc p;
start_time = 0;
More information about the Xfce4-commits
mailing list