hal/volume_id cramfs.c, 1.2, 1.3 dasd.c, 1.3, 1.4 ext.c, 1.3, 1.4 fat.c, 1.4, 1.5 hfs.c, 1.3, 1.4 highpoint.c, 1.4, 1.5 hpfs.c, 1.2, 1.3 iso9660.c, 1.3, 1.4 isw_raid.c, 1.1, 1.2 jfs.c, 1.3, 1.4 linux_raid.c, 1.4, 1.5 linux_swap.c, 1.3, 1.4 lsi_raid.c, 1.1, 1.2 luks.c, 1.4, 1.5 lvm.c, 1.3, 1.4 mac.c, 1.3, 1.4 minix.c, 1.1, 1.2 msdos.c, 1.3, 1.4 ntfs.c, 1.4, 1.5 nvidia_raid.c, 1.1, 1.2 promise_raid.c, 1.1, 1.2 reiserfs.c, 1.4, 1.5 romfs.c, 1.2, 1.3 silicon_raid.c, 1.1, 1.2 sysv.c, 1.2, 1.3 udf.c, 1.3, 1.4 ufs.c, 1.3, 1.4 util.c, 1.4, 1.5 util.h, 1.4, 1.5 via_raid.c, 1.1, 1.2 volume_id.c, 1.7, 1.8 xfs.c, 1.3, 1.4

David Zeuthen david at freedesktop.org
Mon Jun 27 07:52:08 PDT 2005


Update of /cvs/hal/hal/volume_id
In directory gabe:/tmp/cvs-serv15707/volume_id

Modified Files:
	cramfs.c dasd.c ext.c fat.c hfs.c highpoint.c hpfs.c iso9660.c 
	isw_raid.c jfs.c linux_raid.c linux_swap.c lsi_raid.c luks.c 
	lvm.c mac.c minix.c msdos.c ntfs.c nvidia_raid.c 
	promise_raid.c reiserfs.c romfs.c silicon_raid.c sysv.c udf.c 
	ufs.c util.c util.h via_raid.c volume_id.c xfs.c 
Log Message:
2005-06-27  David Zeuthen  <davidz at redhat.com>

        * volume_id/util.h: Include stdint.h to get uint8_t and friends so
        we compile on Linux.

2005-06-27  David Zeuthen  <davidz at redhat.com>

        * configure.in, volume_id/*.c: This patch check for some internal
        Linux kernel types and redefine it using the standard system
        types. It also removes the a private Linux kernel include. Patch
        from Alvaro Lopez Ortega <alvaro at sun.com>.



Index: cramfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/cramfs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cramfs.c	10 Mar 2005 23:18:33 -0000	1.2
+++ cramfs.c	27 Jun 2005 14:52:03 -0000	1.3
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: dasd.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/dasd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dasd.c	27 Jun 2005 04:32:28 -0000	1.3
+++ dasd.c	27 Jun 2005 14:52:03 -0000	1.4
@@ -32,7 +32,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <asm/types.h>
 
 #ifdef HAVE_SYS_IOCCOM_H
 # include <sys/ioccom.h>

Index: ext.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/ext.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ext.c	10 Mar 2005 23:18:33 -0000	1.3
+++ ext.c	27 Jun 2005 14:52:03 -0000	1.4
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "util.h"

Index: fat.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/fat.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fat.c	10 Mar 2005 23:18:33 -0000	1.4
+++ fat.c	27 Jun 2005 14:52:03 -0000	1.5
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: hfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/hfs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hfs.c	10 Mar 2005 23:18:33 -0000	1.3
+++ hfs.c	27 Jun 2005 14:52:03 -0000	1.4
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: highpoint.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/highpoint.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- highpoint.c	11 Mar 2005 18:00:35 -0000	1.4
+++ highpoint.c	27 Jun 2005 14:52:03 -0000	1.5
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: hpfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/hpfs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hpfs.c	10 Mar 2005 23:18:33 -0000	1.2
+++ hpfs.c	27 Jun 2005 14:52:03 -0000	1.3
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: iso9660.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/iso9660.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- iso9660.c	10 Mar 2005 23:18:33 -0000	1.3
+++ iso9660.c	27 Jun 2005 14:52:03 -0000	1.4
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: isw_raid.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/isw_raid.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- isw_raid.c	11 Mar 2005 18:00:35 -0000	1.1
+++ isw_raid.c	27 Jun 2005 14:52:03 -0000	1.2
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: jfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/jfs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jfs.c	10 Mar 2005 23:18:33 -0000	1.3
+++ jfs.c	27 Jun 2005 14:52:03 -0000	1.4
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: linux_raid.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/linux_raid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- linux_raid.c	11 Mar 2005 18:00:35 -0000	1.4
+++ linux_raid.c	27 Jun 2005 14:52:03 -0000	1.5
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: linux_swap.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/linux_swap.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- linux_swap.c	10 Mar 2005 23:18:33 -0000	1.3
+++ linux_swap.c	27 Jun 2005 14:52:03 -0000	1.4
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: lsi_raid.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/lsi_raid.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lsi_raid.c	11 Mar 2005 18:00:35 -0000	1.1
+++ lsi_raid.c	27 Jun 2005 14:52:03 -0000	1.2
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: luks.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/luks.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- luks.c	10 Mar 2005 23:18:33 -0000	1.4
+++ luks.c	27 Jun 2005 14:52:03 -0000	1.5
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "util.h"

Index: lvm.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/lvm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- lvm.c	10 Mar 2005 23:18:33 -0000	1.3
+++ lvm.c	27 Jun 2005 14:52:03 -0000	1.4
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: mac.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/mac.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mac.c	10 Mar 2005 23:18:33 -0000	1.3
+++ mac.c	27 Jun 2005 14:52:03 -0000	1.4
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: minix.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/minix.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- minix.c	10 Mar 2005 23:18:33 -0000	1.1
+++ minix.c	27 Jun 2005 14:52:03 -0000	1.2
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: msdos.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/msdos.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- msdos.c	10 Mar 2005 23:18:33 -0000	1.3
+++ msdos.c	27 Jun 2005 14:52:03 -0000	1.4
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: ntfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/ntfs.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ntfs.c	11 Mar 2005 18:00:35 -0000	1.4
+++ ntfs.c	27 Jun 2005 14:52:03 -0000	1.5
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: nvidia_raid.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/nvidia_raid.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nvidia_raid.c	11 Mar 2005 18:00:35 -0000	1.1
+++ nvidia_raid.c	27 Jun 2005 14:52:03 -0000	1.2
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: promise_raid.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/promise_raid.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- promise_raid.c	11 Mar 2005 18:00:35 -0000	1.1
+++ promise_raid.c	27 Jun 2005 14:52:03 -0000	1.2
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: reiserfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/reiserfs.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- reiserfs.c	10 Mar 2005 23:18:33 -0000	1.4
+++ reiserfs.c	27 Jun 2005 14:52:03 -0000	1.5
@@ -33,7 +33,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: romfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/romfs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- romfs.c	10 Mar 2005 23:18:33 -0000	1.2
+++ romfs.c	27 Jun 2005 14:52:03 -0000	1.3
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: silicon_raid.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/silicon_raid.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- silicon_raid.c	11 Mar 2005 18:00:35 -0000	1.1
+++ silicon_raid.c	27 Jun 2005 14:52:03 -0000	1.2
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: sysv.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/sysv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sysv.c	10 Mar 2005 23:18:33 -0000	1.2
+++ sysv.c	27 Jun 2005 14:52:03 -0000	1.3
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: udf.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/udf.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- udf.c	10 Mar 2005 23:18:33 -0000	1.3
+++ udf.c	27 Jun 2005 14:52:03 -0000	1.4
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: ufs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/ufs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ufs.c	10 Mar 2005 23:18:33 -0000	1.3
+++ ufs.c	27 Jun 2005 14:52:03 -0000	1.4
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: util.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/util.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- util.c	10 Mar 2005 23:18:33 -0000	1.4
+++ util.c	27 Jun 2005 14:52:03 -0000	1.5
@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: util.h
===================================================================
RCS file: /cvs/hal/hal/volume_id/util.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- util.h	10 Mar 2005 23:18:33 -0000	1.4
+++ util.h	27 Jun 2005 14:52:03 -0000	1.5
@@ -29,6 +29,8 @@
 #  include <config.h>
 #endif
 
+#include <stdint.h>
+
 /* size of superblock buffer, reiserfs block is at 64k */
 #define SB_BUFFER_SIZE				0x11000
 /* size of seek buffer, FAT cluster is 32k max */

Index: via_raid.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/via_raid.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- via_raid.c	11 Mar 2005 18:00:35 -0000	1.1
+++ via_raid.c	27 Jun 2005 14:52:03 -0000	1.2
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: volume_id.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/volume_id.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- volume_id.c	11 Mar 2005 18:00:35 -0000	1.7
+++ volume_id.c	27 Jun 2005 14:52:03 -0000	1.8
@@ -35,7 +35,6 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"

Index: xfs.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/xfs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xfs.c	10 Mar 2005 23:18:33 -0000	1.3
+++ xfs.c	27 Jun 2005 14:52:03 -0000	1.4
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"




More information about the hal-commit mailing list