Standardise protective include file #defines.

diff --git a/WHATS_NEW b/WHATS_NEW
index f27879b63a3afa9baa368cce512a87753e594075..b3de5bb0f78ed311c618fe601be321043bae3f9d 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 1.02.19 -
 ====================================
+  Standardise protective include file #defines.
   Add regex functions to library.
   Avoid trailing separator in reports when there are hidden sort fields.
   Fix segfault in 'dmsetup status' without --showkeys against crypt target.

diff --git a/include/intl.h b/include/intl.h
index ed6335dd07aff2c0ab947d37356966975dd9b48f..31296710130e762812732276efc9622724b472f1 100644 (file)
--- a/include/intl.h
+++ b/include/intl.h
@@ -13,8 +13,8 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _LVM_INTL_H
-#define _LVM_INTL_H
+#ifndef _DM_INTL_H
+#define _DM_INTL_H
 
 #ifdef INTL_PACKAGE
 #  include <libintl.h>

diff --git a/include/kdev_t.h b/include/kdev_t.h
index e5433d32d86793151ca815a2eed9c2633a113f0f..3a4a75e9be8a96fcf918503113ee6689b554e5c0 100644 (file)
--- a/include/kdev_t.h
+++ b/include/kdev_t.h
@@ -12,8 +12,8 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _LVM_KDEV_H
-#define _LVM_KDEV_H
+#ifndef _DM_KDEV_H
+#define _DM_KDEV_H
 
 #define MAJOR(dev)      ((dev & 0xfff00) >> 8)
 #define MINOR(dev)      ((dev & 0xff) | ((dev >> 12) & 0xfff00))

diff --git a/include/lib.h b/include/lib.h
index daad639d760114d8452399f1a45ee0f3eb188e24..dbb5b9677fb80dbfaed65bfcc332ecacf70c2e8a 100644 (file)
--- a/include/lib.h
+++ b/include/lib.h
@@ -16,8 +16,8 @@
 /*
  * This file must be included first by every library source file.
  */
-#ifndef _LVM_LIB_H
-#define _LVM_LIB_H
+#ifndef _DM_LIB_H
+#define _DM_LIB_H
 
 #define _REENTRANT
 #define _GNU_SOURCE

diff --git a/include/list.h b/include/list.h
index 11765ec9727bb70d8d763b88a5f4c6881bd5e5fa..5ed9707d1f36a51629604e90caf378c9e6ce7449 100644 (file)
--- a/include/list.h
+++ b/include/list.h
@@ -13,8 +13,8 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _LVM_LIST_H
-#define _LVM_LIST_H
+#ifndef _DM_LIST_H
+#define _DM_LIST_H
 
 #include <assert.h>
 #include <stdio.h>

diff --git a/include/log.h b/include/log.h
index 72e5d5d5bd4143a528e62e65bb46161c867b484f..2729ccfd0da62c99a384ea50756c0688e8b2b86d 100644 (file)
--- a/include/log.h
+++ b/include/log.h
@@ -13,8 +13,8 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef LIB_DMLOG_H
-#define LIB_DMLOG_H
+#ifndef _DM_LOG_H
+#define _DM_LOG_H
 
 #include "libdevmapper.h"
 

diff --git a/lib/datastruct/bitset.h b/lib/datastruct/bitset.h
index 939e4932b79108557b90f168c4c41e9b2d44310d..bb7924ecd42cf03c4dc85d5796fd81358318d548 100644 (file)
--- a/lib/datastruct/bitset.h
+++ b/lib/datastruct/bitset.h
@@ -13,8 +13,8 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _LVM_BITSET_H
-#define _LVM_BITSET_H
+#ifndef _DM_BITSET_H
+#define _DM_BITSET_H
 
 #include "pool.h"
 

diff --git a/lib/datastruct/hash.h b/lib/datastruct/hash.h
index 0f745e5325dea465c6ffe333913184fe1ec39c26..13b7c862784df42924a04ebc2f501d781e6817db 100644 (file)
--- a/lib/datastruct/hash.h
+++ b/lib/datastruct/hash.h
@@ -13,8 +13,8 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _LVM_HASH_H
-#define _LVM_HASH_H
+#ifndef _DM_HASH_H
+#define _DM_HASH_H
 
 struct hash_table;
 struct hash_node;

diff --git a/lib/mm/dbg_malloc.h b/lib/mm/dbg_malloc.h
index a6553074a135322b1bd7bd84b98458b117f8f5eb..2399725b166f9d51b274571783727b293ec2ae5e 100644 (file)
--- a/lib/mm/dbg_malloc.h
+++ b/lib/mm/dbg_malloc.h
@@ -13,8 +13,8 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _LVM_DBG_MALLOC_H
-#define _LVM_DBG_MALLOC_H
+#ifndef _DM_DBG_MALLOC_H
+#define _DM_DBG_MALLOC_H
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/lib/mm/pool.h b/lib/mm/pool.h
index 01700460a34e23bb9d1a6287471ba199710581b7..505f0a6b71626710b4a7723118ac39481c4c998f 100644 (file)
--- a/lib/mm/pool.h
+++ b/lib/mm/pool.h
@@ -13,8 +13,8 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _LVM_POOL_H
-#define _LVM_POOL_H
+#ifndef _DM_POOL_H
+#define _DM_POOL_H
 
 #include <string.h>
 #include <stdlib.h>