Module Name: src
Committed By: haad
Date: Sat Dec 5 11:42:24 UTC 2009
Modified Files:
src/external/gpl2/lvm2/dist/libdm: libdm-common.c
src/external/gpl2/lvm2/dist/libdm/ioctl: libdm-nbsd-iface.c
libdm_netbsd.c
Log Message:
Addapt libdevmapper library to new header file changes.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/lvm2/dist/libdm/libdm-common.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c \
src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/lvm2/dist/libdm/libdm-common.c
diff -u src/external/gpl2/lvm2/dist/libdm/libdm-common.c:1.4 src/external/gpl2/lvm2/dist/libdm/libdm-common.c:1.5
--- src/external/gpl2/lvm2/dist/libdm/libdm-common.c:1.4 Wed Dec 2 00:58:03 2009
+++ src/external/gpl2/lvm2/dist/libdm/libdm-common.c Sat Dec 5 11:42:24 2009
@@ -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/"
Index: src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c
diff -u src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c:1.4 src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c:1.5
--- src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c:1.4 Wed Dec 2 01:53:25 2009
+++ src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c Sat Dec 5 11:42:24 2009
@@ -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>
Index: src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c
diff -u src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c:1.4 src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c:1.5
--- src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c:1.4 Tue Dec 1 23:11:17 2009
+++ src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c Sat Dec 5 11:42:24 2009
@@ -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
