diff options
| author | Andreas Dilger <adilger@sun.com> | 2008-08-24 20:37:39 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2008-08-24 20:37:39 -0400 |
| commit | 864b8d4eab6a8b38fa9f89ac1475ad364f5a40b8 (patch) | |
| tree | e94c5bef004c179fe063ee00291fec6c736bd36f | |
| parent | a5e14ead2e2a594c51c5ecac1fe318a331860f50 (diff) | |
| download | e2fsprogs-864b8d4eab6a8b38fa9f89ac1475ad364f5a40b8.tar.gz | |
Fix miscellaneous compile warnings
Signed-off-by: Andreas Dilger <adilger@sun.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
| -rw-r--r-- | e2fsck/unix.c | 1 | ||||
| -rw-r--r-- | lib/blkid/read.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/e2fsck/unix.c b/e2fsck/unix.c index 41aa99ba..be576848 100644 --- a/e2fsck/unix.c +++ b/e2fsck/unix.c @@ -48,6 +48,7 @@ extern int optind; #include <dirent.h> #endif +#include "e2p/e2p.h" #include "et/com_err.h" #include "e2p/e2p.h" #include "e2fsck.h" diff --git a/lib/blkid/read.c b/lib/blkid/read.c index dad6147e..b913b631 100644 --- a/lib/blkid/read.c +++ b/lib/blkid/read.c @@ -10,6 +10,8 @@ * %End-Header% */ +#define _XOPEN_SOURCE 600 /* for inclusion of strtoull */ + #include <stdio.h> #include <ctype.h> #include <string.h> @@ -26,7 +28,6 @@ #include "uuid/uuid.h" #ifdef HAVE_STRTOULL -#define __USE_ISOC9X #define STRTOULL strtoull /* defined in stdlib.h if you try hard enough */ #else /* FIXME: need to support real strtoull here */ @@ -319,8 +320,7 @@ static int parse_tag(blkid_cache cache, blkid_dev dev, char **cp) else if (!strcmp(name, "PRI")) dev->bid_pri = strtol(value, 0, 0); else if (!strcmp(name, "TIME")) - /* FIXME: need to parse a long long eventually */ - dev->bid_time = strtol(value, 0, 0); + dev->bid_time = STRTOULL(value, 0, 0); else ret = blkid_set_tag(dev, name, value, strlen(value)); |