Fix userspace inclusion of libxfs.h for other tools.

Merge of master-melb:xfs-cmds:25995a by kenmcd.

diff --git a/include/Makefile b/include/Makefile
index 4aab957ea6b4bf226518c769addad9307e6c8683..2cd523f339e085b9314da2391a90ae5f294b8167 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -18,7 +18,7 @@
 TOPDIR = ..
 include $(TOPDIR)/include/builddefs
 
-HFILES = handle.h jdm.h libxfs.h libxlog.h parent.h xfs.h xqm.h \
+HFILES = cache.h handle.h jdm.h libxfs.h libxlog.h list.h parent.h xfs.h xqm.h \
        xfs_ag.h xfs_alloc.h xfs_alloc_btree.h xfs_arch.h xfs_attr_leaf.h \
        xfs_attr_sf.h xfs_bit.h xfs_bmap.h xfs_bmap_btree.h xfs_btree.h \
        xfs_buf_item.h xfs_da_btree.h xfs_dfrag.h xfs_dinode.h \
@@ -34,7 +34,7 @@ PHFILES = darwin.h freebsd.h irix.h linux.h
 DKHFILES = volume.h fstyp.h dvh.h
 LSRCFILES = $(shell echo $(PHFILES) | sed -e "s/$(PKG_PLATFORM).h//g")
 LSRCFILES += platform_defs.h.in builddefs.in buildmacros buildrules $(DKHFILES)
-LSRCFILES += cache.h command.h input.h list.h path.h project.h
+LSRCFILES += command.h input.h path.h project.h
 LDIRT = xfs disk
 
 default install :

diff --git a/include/libxfs.h b/include/libxfs.h
index e430d00b7f4d8e8e28fd7e7958500bcfd0670fd0..fc855bcac33db888f508df44a93f8739c2057aa4 100644 (file)
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -23,7 +23,7 @@
 
 #include <xfs/platform_defs.h>
 
-#include "pthread.h"
+#include <pthread.h>
 #include <xfs/list.h>
 #include <xfs/cache.h>