s/HAVE___U32_T/HAVE___U32/g

Thanks to Eric Sandeen for finding this.
Merge of master-melb:xfs-cmds:28754a by kenmcd.

  s/HAVE___U32_T/HAVE___U32/g
  Thanks to Eric Sandeen for finding this.

diff --git a/aclocal.m4 b/aclocal.m4
index 25664471b86664656ef20e0ef5a35b8217121776..eadf4dace4935b03ab4a08aa1df3c9c3809121f9 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -317,7 +317,7 @@ AC_DEFUN([AC_TYPE_U32],
 #include <stddef.h>
     ], [
          __u32  u32;
-    ], AC_DEFINE(HAVE___U32_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
+    ], AC_DEFINE(HAVE___U32) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
   ])
 
 # 

diff --git a/doc/CHANGES b/doc/CHANGES
index 31e55d9b07411c2ecd7531ebc98691a06f0d0cec..9e97aed06a161dd3b6a8f01e11d16aeadb8038b5 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+xfsprogs-2.8.22
+       - Fix up the HAVE___U32 fix from 2.8.20
+         Thanks to Eric Sandeen for pointing this out.
+
 xfsprogs-2.8.21 (28 May 2007)
        - Add support for lazy superblock counters in mkfs.xfs, xfs_db,
          xfs_repair, xfs_growfs and also libxfs.

diff --git a/m4/package_types.m4 b/m4/package_types.m4
index 7630e932366f63501524c3375ae0b5ab8f342fe9..0a0e08774614da239681e94d0385aaa29276d847 100644 (file)
--- a/m4/package_types.m4
+++ b/m4/package_types.m4
@@ -37,7 +37,7 @@ AC_DEFUN([AC_TYPE_U32],
 #include <stddef.h>
     ], [
          __u32  u32;
-    ], AC_DEFINE(HAVE___U32_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
+    ], AC_DEFINE(HAVE___U32) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
   ])
 
 #