[Xfce4-commits] <xfce4-power-manager:master> Corrected check for Solaris macros

[Nick Schermer]

Updating branch refs/heads/master
         to 8ef0d25692d1cc307a65634bc86458ac2a787fe5 (commit)
       from 0edc684f2b020f946ac5f7f9620d1e5e16294ef9 (commit)

commit 8ef0d25692d1cc307a65634bc86458ac2a787fe5
Author: Guido Berhoerster <gber at openindiana.org>
Date:   Mon Apr 25 10:32:41 2011 +0200

    Corrected check for Solaris macros
    
    Thanks to Raimund Steger for pointing that out

 src/xfpm-polkit.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/xfpm-polkit.c b/src/xfpm-polkit.c
index 29fcf7d..f997415 100644
--- a/src/xfpm-polkit.c
+++ b/src/xfpm-polkit.c
@@ -38,7 +38,7 @@
 #include <sys/user.h>
 #elif defined(__FreeBSD__)
 #include <sys/stat.h>
-#elif defined(__SVR4) || defined(__sun)
+#elif defined(__SVR4) && defined(__sun)
 #include <fcntl.h>
 #include <procfs.h>
 #endif
@@ -192,7 +192,7 @@ get_start_time_for_pid (pid_t pid)
     start_time = (guint64) p.ki_start.tv_sec;
     
 out:
-#elif defined(__SVR4) || defined(__sun)
+#elif defined(__SVR4) && defined(__sun)
 
     psinfo_t p;
     gchar *filename;