Move hgfs.h to minix includes directory

diff --git a/common/include/Makefile.inc b/common/include/Makefile.inc
index 1b38a2783db34de1847fa6d908c86f24c716dcb3..abb013e9321c07297b9952926c1faf5636ab91ef 100644 (file)
--- a/common/include/Makefile.inc
+++ b/common/include/Makefile.inc
@@ -2,7 +2,7 @@
 
 .PATH: ${MINIXSRCDIR}/common/include
 
-INCS+=  env.h fetch.h hgfs.h lib.h libutil.h timers.h
+INCS+=  env.h fetch.h lib.h libutil.h timers.h
 
 INCS+=         minix/acpi.h minix/ansi.h minix/audio_fw.h minix/bitmap.h \
        minix/bdev.h minix/blockdriver.h minix/blockdriver_mt.h \
@@ -12,7 +12,7 @@ INCS+=        minix/acpi.h minix/ansi.h minix/audio_fw.h minix/bitmap.h \
        minix/debug.h minix/devio.h minix/devman.h minix/dmap.h \
        minix/driver.h minix/drivers.h minix/drvlib.h minix/ds.h \
        minix/endpoint.h minix/fslib.h minix/gcov.h minix/hash.h \
-       minix/ioctl.h minix/input.h minix/ipc.h minix/ipcconst.h \
+       minix/hgfs.h minix/ioctl.h minix/input.h minix/ipc.h minix/ipcconst.h \
        minix/keymap.h minix/limits.h minix/mthread.h minix/minlib.h \
        minix/netdriver.h minix/optset.h minix/partition.h minix/portio.h \
        minix/priv.h minix/procfs.h minix/profile.h minix/queryparam.h \

diff --git a/common/include/hgfs.h b/common/include/minix/hgfs.h
similarity index 100%
rename from common/include/hgfs.h
rename to common/include/minix/hgfs.h

diff --git a/include/Makefile b/include/Makefile
index 1d3026ef7818271f3225c9b0e05b1c8e3bfdff0d..e562cf40dfa838322f3fe2e5ac59e6b9b88f9f78 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -9,7 +9,7 @@ INCS=   alloca.h a.out.h ar.h assert.h configfile.h ctype.h \
        stdint.h stdbool.h stdio.h stdlib.h string.h strings.h sysexits.h \
        syslog.h tar.h termcap.h time.h timers.h tools.h \
        ttyent.h ucontext.h unistd.h utime.h utmp.h wchar.h wctype.h \
-       hgfs.h tzfile.h util.h fetch.h mpool.h ndbm.h db.h poll.h resolv.h \
+       tzfile.h util.h fetch.h mpool.h ndbm.h db.h poll.h resolv.h \
        memory.h paths.h complex.h
 INCS+= arpa/inet.h arpa/nameser.h
 INCS+= minix/a.out.h minix/cdrom.h minix/compiler-ack.h minix/dirent.h \

diff --git a/lib/libhgfs/inc.h b/lib/libhgfs/inc.h
index 7d7e7ab21182c1f54c3083982789d5d1b66d2d93..dcfd277c30737ee024877af33caa199acc14ab93 100644 (file)
--- a/lib/libhgfs/inc.h
+++ b/lib/libhgfs/inc.h
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "hgfs.h"
+#include <minix/hgfs.h>
 
 #define PREFIX(x) __libhgfs_##x
 

diff --git a/servers/hgfs/inc.h b/servers/hgfs/inc.h
index b83f730816ad6d3e593e5dd200d17159346ab531..915255f12d1731273f42cbeb14d6c19698f02132 100644 (file)
--- a/servers/hgfs/inc.h
+++ b/servers/hgfs/inc.h
@@ -29,7 +29,7 @@
 #include <sys/stat.h>
 #include <sys/queue.h>
 
-#include "hgfs.h"
+#include <minix/hgfs.h>
 
 #include "type.h"
 #include "const.h"