--- net-snmp-5.2.1.2.orig/agent/mibgroup/ucd-snmp/disk.c	2007-01-10 15:06:56.000000000 +0200
+++ net-snmp-5.2.1.2/agent/mibgroup/ucd-snmp/disk.c	2007-01-10 15:15:45.000000000 +0200
@@ -230,7 +230,7 @@
 static void 
 disk_parse_config(const char *token, char *cptr)
 {
-#if HAVE_FSTAB_H || HAVE_GETMNTENT || HAVE_STATFS
+#if defined(HAVE_FSTAB_H) || defined(HAVE_GETMNTENT) || defined(HAVE_STATFS)
   char            tmpbuf[1024];
   char            path[STRMAX];
   int             minpercent;
@@ -278,7 +278,7 @@
 static void 
 disk_parse_config_all(const char *token, char *cptr)
 {
-#if HAVE_FSTAB_H || HAVE_GETMNTENT || HAVE_STATFS
+#if defined(HAVE_FSTAB_H) || defined(HAVE_GETMNTENT) || defined(HAVE_STATFS)
   char            tmpbuf[1024];
   int             minpercent = DISKMINPERCENT;
     
@@ -374,16 +374,16 @@
 static void 
 find_and_add_allDisks(int minpercent)
 {
-#if HAVE_GETMNTENT
-#if HAVE_SYS_MNTTAB_H
+#if defined(HAVE_GETMNTENT)
+#if defined(HAVE_SYS_MNTTAB_H)
   struct mnttab   mnttab;
 #else
   struct mntent  *mntent;
 #endif
   FILE           *mntfp;
-#elif HAVE_FSTAB_H
+#elif defined(HAVE_FSTAB_H)
   struct fstab   *fstab1;
-#elif HAVE_STATFS
+#elif defined(HAVE_STATFS)
   struct statfs   statf;
 #endif
 #if defined(HAVE_GETMNTENT) && !defined(HAVE_SETMNTENT)
@@ -397,9 +397,9 @@
    * string declared above and at the end of the routine return it
    * to the caller 
    */
-#if HAVE_FSTAB_H || HAVE_GETMNTENT || HAVE_STATFS   
-#if HAVE_GETMNTENT
-#if HAVE_SETMNTENT
+#if defined(HAVE_FSTAB_H) || defined(HAVE_GETMNTENT) || defined(HAVE_STATFS)
+#if defined(HAVE_GETMNTENT)
+#if defined(HAVE_SETMNTENT)
   mntfp = setmntent(ETC_MNTTAB, "r");
   while (NULL != (mntent = getmntent(mntfp))) {
     add_device(mntent->mnt_dir, mntent->mnt_fsname, -1, minpercent, 0);
@@ -425,7 +425,7 @@
      */
   }
 #endif /* HAVE_SETMNTENT */
-#elif HAVE_FSTAB_H
+#elif defined(HAVE_FSTAB_H)
   setfsent();			/* open /etc/fstab */
   while((fstab1 = getfsent()) != NULL) {
     add_device(fstab1->fs_file, fstab1->fs_spec, -1, minpercent, 0);
@@ -437,7 +437,7 @@
      * dummy clause for else below
      */
   }
-#elif HAVE_STATFS
+#elif defined(HAVE_STATFS)
   /*
    * since there is no way to get all the mounted systems with just
    * statfs we default to the root partition "/"
@@ -468,17 +468,17 @@
 static u_char *
 find_device(char *path)
 {
-#if HAVE_GETMNTENT
-#if HAVE_SYS_MNTTAB_H
+#if defined(HAVE_GETMNTENT)
+#if defined(HAVE_SYS_MNTTAB_H)
   struct mnttab   mnttab;
 #else
   struct mntent  *mntent;
 #endif
   FILE           *mntfp;
-#elif HAVE_FSTAB_H
+#elif defined(HAVE_FSTAB_H)
   struct fstab   *fstab;
   struct stat     stat1;
-#elif HAVE_STATFS
+#elif defined(HAVE_STATFS)
   struct statfs   statf;
 #endif
   char            tmpbuf[1024];
@@ -494,9 +494,9 @@
    * string declared above and at the end of the routine return it
    * to the caller 
    */
-#if HAVE_FSTAB_H || HAVE_GETMNTENT || HAVE_STATFS   
-#if HAVE_GETMNTENT
-#if HAVE_SETMNTENT
+#if defined(HAVE_FSTAB_H) || defined(HAVE_GETMNTENT) || defined(HAVE_STATFS)   
+#if defined(HAVE_GETMNTENT)
+#if defined(HAVE_SETMNTENT)
   mntfp = setmntent(ETC_MNTTAB, "r");
   while (NULL != (mntent = getmntent(mntfp)))
     if (strcmp(path, mntent->mnt_dir) == 0) {
@@ -526,7 +526,7 @@
 	       sizeof(device));
   }
 #endif /* HAVE_SETMNTENT */
-#elif HAVE_FSTAB_H
+#elif defined(HAVE_FSTAB_H)
   stat(path, &stat1);
   setfsent();
   if ((fstab = getfsfile(path))) {
@@ -540,7 +540,7 @@
       */
    }
 
-#elif HAVE_STATFS
+#elif defined(HAVE_STATFS)
   if (statfs(path, &statf) == 0) {
     copy_word(statf.f_mntfromname, device);
     DEBUGMSGTL(("ucd-snmp/disk", "Disk:  %s\n",
@@ -601,7 +601,7 @@
     struct statvfs  vfs;
 #endif
 #else
-#if HAVE_FSTAB_H
+#if defined(HAVE_FSTAB_H)
     int             file;
     union {
         struct fs       iu_fs;
@@ -719,7 +719,7 @@
         return ((u_char *) (errmsg));
     }
 #else
-#if HAVE_FSTAB_H
+#if defined(HAVE_FSTAB_H)
     /*
      * read the disk information 
      */