[src/trunk]: src/external/gpl2/lvm2/dist/libdm Addapt libdevmapper library to...

[haad <haad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2e1eea9721f1
branches:  trunk
changeset: 749658:2e1eea9721f1
user:      haad <haad%NetBSD.org@localhost>
date:      Sat Dec 05 11:42:24 2009 +0000

description:
Addapt libdevmapper library to new header file changes.

diffstat:

 external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c |  5 +++--
 external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c     |  5 +++--
 external/gpl2/lvm2/dist/libdm/libdm-common.c           |  4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diffs (67 lines):

diff -r 2c5a752efed9 -r 2e1eea9721f1 external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c
--- a/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c    Sat Dec 05 11:38:40 2009 +0000
+++ b/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c    Sat Dec 05 11:42:24 2009 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: libdm-nbsd-iface.c,v 1.4 2009/12/02 01:53:25 haad Exp $        */
+/*      $NetBSD: libdm-nbsd-iface.c,v 1.5 2009/12/05 11:42:24 haad Exp $        */
 
 /*
  * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
@@ -19,6 +19,7 @@
 #include "dmlib.h"
 #include "libdm-targets.h"
 #include "libdm-common.h"
+#include "libdm-netbsd.h"
 
 #include <sys/ioctl.h>
 #include <sys/sysctl.h>
@@ -27,7 +28,7 @@
 #include <dirent.h>
 #include <limits.h>
 
-#include <netbsd-dm.h>
+#include <dev/dm/netbsd-dm.h>
 
 #include <dm-ioctl.h>
 
diff -r 2c5a752efed9 -r 2e1eea9721f1 external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c
--- a/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c        Sat Dec 05 11:38:40 2009 +0000
+++ b/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c        Sat Dec 05 11:42:24 2009 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: libdm_netbsd.c,v 1.4 2009/12/01 23:11:17 haad Exp $        */
+/*      $NetBSD: libdm_netbsd.c,v 1.5 2009/12/05 11:42:24 haad Exp $        */
 
 /*
  * Copyright (c) 1996, 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -41,11 +41,12 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <netbsd-dm.h>
+#include <dev/dm/netbsd-dm.h>
 
 #include <dm-ioctl.h>
 
 #include "lib.h"
+#include "libdm-netbsd.h"
 
 #define DMI_SIZE 16 * 1024
 
diff -r 2c5a752efed9 -r 2e1eea9721f1 external/gpl2/lvm2/dist/libdm/libdm-common.c
--- a/external/gpl2/lvm2/dist/libdm/libdm-common.c      Sat Dec 05 11:38:40 2009 +0000
+++ b/external/gpl2/lvm2/dist/libdm/libdm-common.c      Sat Dec 05 11:42:24 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: libdm-common.c,v 1.4 2009/12/02 00:58:03 haad Exp $    */
+/*     $NetBSD: libdm-common.c,v 1.5 2009/12/05 11:42:24 haad Exp $    */
 
 /*
  * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
@@ -48,7 +48,7 @@
 #endif
 
 #ifdef __NetBSD__
-#include <netbsd-dm.h>
+#include "libdm-netbsd.h"
 #endif
 
 #define DEV_DIR "/dev/"