r490 - in devmapper/trunk: debian include lib/ioctl

[Bastian Blank]

Author: waldi
Date: Fri Jul  6 08:38:13 2007
New Revision: 490

Log:
* debian/changelog: Update.
* include/kdev_t.h: Define own kernel_dev_t.
* lib/ioctl/libdm-compat.h: Use own kernel_dev_t.


Modified:
   devmapper/trunk/debian/changelog
   devmapper/trunk/include/kdev_t.h
   devmapper/trunk/lib/ioctl/libdm-compat.h

Modified: devmapper/trunk/debian/changelog
==============================================================================
--- devmapper/trunk/debian/changelog	(original)
+++ devmapper/trunk/debian/changelog	Fri Jul  6 08:38:13 2007
@@ -1,3 +1,9 @@
+devmapper (2:1.02.20-2) UNRELEASED; urgency=low
+
+  * Woraround kernel headers.
+
+ -- Bastian Blank <waldi at debian.org>  Fri,  6 Jul 2007 08:35:17 +0000
+
 devmapper (2:1.02.20-1) unstable; urgency=low
 
   * New upstream version.

Modified: devmapper/trunk/include/kdev_t.h
==============================================================================
--- devmapper/trunk/include/kdev_t.h	(original)
+++ devmapper/trunk/include/kdev_t.h	Fri Jul  6 08:38:13 2007
@@ -15,8 +15,12 @@
 #ifndef _DM_KDEV_H
 #define _DM_KDEV_H
 
+#include <linux/types.h>
+
 #define MAJOR(dev)      ((dev & 0xfff00) >> 8)
 #define MINOR(dev)      ((dev & 0xff) | ((dev >> 12) & 0xfff00))
 #define MKDEV(ma,mi)    ((mi & 0xff) | (ma << 8) | ((mi & ~0xff) << 12))
 
+typedef __u32 my_kernel_dev_t;
+
 #endif

Modified: devmapper/trunk/lib/ioctl/libdm-compat.h
==============================================================================
--- devmapper/trunk/lib/ioctl/libdm-compat.h	(original)
+++ devmapper/trunk/lib/ioctl/libdm-compat.h	Fri Jul  6 08:38:13 2007
@@ -19,6 +19,7 @@
 #include "kdev_t.h"
 #include <inttypes.h>
 #include <linux/dm-ioctl.h>
+#include <linux/types.h>
 #include <sys/ioctl.h>
 
 struct dm_task;
@@ -40,7 +41,7 @@
 	int32_t open_count;	/* out */
 	uint32_t flags;		/* in/out */
 
-	__kernel_dev_t dev;	/* in/out */
+	my_kernel_dev_t dev;	/* in/out */
 
 	char name[DM_NAME_LEN];	/* device name */
 	char uuid[DM_UUID_LEN];	/* unique identifier for
@@ -60,7 +61,7 @@
 struct dm_target_deps_v1 {
 	uint32_t count;
 
-	__kernel_dev_t dev[0];	/* out */
+	my_kernel_dev_t dev[0];	/* out */
 };
 
 enum {