Changeset 142 in MondoRescue for trunk/mondo/mondo/common/my-stuff.h

Timestamp:

Nov 27, 2005, 10:38:41 PM (18 years ago)

Author:

bcornec

Message:

merge -r139:141 $SVN_M/branches/2.05
splint improvements (begin)

File:

• trunk/mondo/mondo/common/my-stuff.h (modified) (2 diffs)

trunk/mondo/mondo/common/my-stuff.h

@@ -61 +61 @@
 #include <time.h>
 #include <unistd.h>
+#ifndef S_SPLINT_S
 #include <signal.h>
+#endif
 //#include <curses.h>
 #include <newt.h>
 #include <ctype.h>
 #include <string.h>
+#ifndef S_SPLINT_S
 #include <pthread.h>
+#endif
 #include <assert.h>
 
@@ -338 +342 @@
 #define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/md"
 #define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
-#define SANE_FORMATS        "swap image vfat ext2 ext3 xfs vfs jfs reiserfs dos minix coda nfs ntfs hpfs raid lvm"
+#define SANE_FORMATS        "swap image vfat ext2 ext3 xfs vfs jfs reiserfs dos minix coda nfs ntfs hpfs raid lvm cifs"
 #define ALT_TAPE        "/dev/ht0"
 #define MKE2FS_OR_NEWFS "mke2fs"