--- projects/libstatgrab/src/libstatgrab/tools.c	2004/01/19 16:49:21	1.24
+++ projects/libstatgrab/src/libstatgrab/tools.c	2004/02/10 16:07:43	1.25
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  * 02111-1307 USA
  *
- * $Id: tools.c,v 1.24 2004/01/19 16:49:21 tdb Exp $
+ * $Id: tools.c,v 1.25 2004/02/10 16:07:43 pajs Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -54,7 +54,7 @@
 #include <dirent.h>
 #endif
 
-#ifdef SOLARIS
+#if defined(SOLARIS) && !defined(HAVE_LIBDEVINFO_H)
 struct map{
 	char *bsd;
 	char *svr;
@@ -469,7 +469,9 @@ int statgrab_init(){
 	 * will still work, just no disk mappings. So we will ignore the exit
 	 * status of this, and carry on merrily.
 	 */
+#ifdef(HAVE_LIBDEVINFO_H)
 	build_mapping();
+#endif
 #endif
 	return 0;
 }