summaryrefslogtreecommitdiff
path: root/extras/dasd_id
diff options
context:
space:
mode:
Diffstat (limited to 'extras/dasd_id')
-rw-r--r--extras/dasd_id/Makefile2
-rw-r--r--extras/dasd_id/dasd_id.c7
2 files changed, 3 insertions, 6 deletions
diff --git a/extras/dasd_id/Makefile b/extras/dasd_id/Makefile
index 33bb6965cd..3b0a35f75f 100644
--- a/extras/dasd_id/Makefile
+++ b/extras/dasd_id/Makefile
@@ -28,8 +28,6 @@ INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
-CFLAGS+=-D_FILE_OFFSET_BITS=64
-
OBJS = dasd_id.o ../../udev.a
$(OBJS): $(HEADERS)
diff --git a/extras/dasd_id/dasd_id.c b/extras/dasd_id/dasd_id.c
index e2df65d6ec..a6f2de0db7 100644
--- a/extras/dasd_id/dasd_id.c
+++ b/extras/dasd_id/dasd_id.c
@@ -33,7 +33,6 @@
#include <fcntl.h>
#include <errno.h>
#include <sys/ioctl.h>
-#include <asm/types.h>
#include "../../logging.h"
#include "../../udev_utils.h"
@@ -140,7 +139,7 @@ static unsigned char EBCtoASC[256] =
0x38, 0x39, 0x07, 0x07, 0x9A, 0x07, 0x07, 0x07
};
-static void vtoc_ebcdic_dec (const unsigned char *source, char *target, int l)
+static void vtoc_ebcdic_dec (const unsigned char *source, unsigned char *target, int l)
{
int i;
@@ -183,8 +182,8 @@ static int dasd_id(int fd)
{
int blocksize;
dasd_information_t info;
- __u8 *data;
- __u8 *label_raw;
+ unsigned char *data;
+ unsigned char *label_raw;
if (ioctl(fd, BIODASDINFO, &info) != 0) {
dbg("not a dasd");