[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] tier1/solid/src/solid/backends/hal: Use config-solid.h to check for HAVE_MNTENT
From:       Kevin Ottens <ervin () kde ! org>
Date:       2012-08-24 19:06:06
Message-ID: 20120824190606.BF96EA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 10fe1bccd1e0f27bc79aee3059276f8d065b9299 by Kevin Ottens.
Committed on 24/08/2012 at 20:47.
Pushed by ervin into branch 'frameworks'.

Use config-solid.h to check for HAVE_MNTENT_H

Also fixing a typing problem... looks like I reactivated some code which
didn't get compiled in a while. :-)

M  +2    -1    tier1/solid/src/solid/backends/hal/halfstabhandling.cpp

http://commits.kde.org/kdelibs/10fe1bccd1e0f27bc79aee3059276f8d065b9299

diff --git a/tier1/solid/src/solid/backends/hal/halfstabhandling.cpp \
b/tier1/solid/src/solid/backends/hal/halfstabhandling.cpp index 22fe564..3a6488d \
                100644
--- a/tier1/solid/src/solid/backends/hal/halfstabhandling.cpp
+++ b/tier1/solid/src/solid/backends/hal/halfstabhandling.cpp
@@ -28,6 +28,7 @@
 #include <QtCore/QTime>
 
 #include <solid/soliddefs_p.h>
+#include <config-solid.h>
 
 #if HAVE_MNTENT_H
 #include <mntent.h>
@@ -88,7 +89,7 @@ void _k_updateMountPointsCache()
 
 #ifdef HAVE_SETMNTENT
 
-    struct mntent *fstab;
+    FILE *fstab;
     if ((fstab = setmntent(FSTAB, "r")) == 0) {
         return;
     }


[prev in list] [next in list] [prev in thread] [next in thread]