[Pkg-wmaker-commits] [wmbattery] 212/241: wmbattery: Avoid redefinition of apm_read/apm_exists in *BSD.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmbattery.

commit 03b9cbd197653c5614a7bee4fdc593774024b76a
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Thu Feb 19 23:34:20 2015 -0600

    wmbattery: Avoid redefinition of apm_read/apm_exists in *BSD.
    
    The two functions are defined if the BSD-specific apm headers are found and
    if libapm is not found.  Both of these conditions will be true on BSD
    systems, so we use #elif instead of the separate #if statements.
---
 wmbattery.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/wmbattery.c b/wmbattery.c
index 1c74409..a7b752f 100644
--- a/wmbattery.c
+++ b/wmbattery.c
@@ -147,8 +147,7 @@ int apm_exists(void)
 		return 0;
 	return apm_read(&i);
 }
-#endif
-#if !defined(HAVE_LIBAPM)
+#elif !defined(HAVE_LIBAPM)
 int apm_read(apm_info *i)
 {
 	return -1;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbattery.git