FAT: Better isolation from host headers for the fat_shell.

Fixes the build on FreeBSD.

src/add-ons/kernel/file_systems/fat/bsd/kern/subr_clock.c

@@ -38,6 +38,7 @@
 // Modified to support the Haiku FAT driver.
 
 #ifdef FS_SHELL
+#include "sys/types.h"
 #include "fssh_api_wrapper.h"
 #else
 #include <real_time_clock.h>

src/add-ons/kernel/file_systems/fat/bsd/kern/vfs_cache.c

@@ -36,10 +36,11 @@
 // Modified to support the Haiku FAT driver.
 
 #ifdef FS_SHELL
+#include "sys/types.h"
 #include "fssh_api_wrapper.h"
 #else
 #include <fs_cache.h>
-#endif // FS_SHELL
+#endif
 
 #include "sys/param.h"
 #include "sys/systm.h"

src/add-ons/kernel/file_systems/fat/bsd/kern/vfs_hash.c

@@ -30,6 +30,7 @@
 // Modified to support the Haiku FAT driver.
 
 #ifdef FS_SHELL
+#include "sys/types.h"
 #include "fssh_api_wrapper.h"
 #else
 #include <sys/stat.h>

src/add-ons/kernel/file_systems/fat/bsd/kern/vfs_subr.c

@@ -38,6 +38,7 @@
 // Modified to support the Haiku FAT driver.
 
 #ifdef FS_SHELL
+#include "sys/types.h"
 #include "fssh_api_wrapper.h"
 #else
 #include <disk_device_manager.h>

src/add-ons/kernel/file_systems/fat/bsd/sys/iconv.h

@@ -37,6 +37,8 @@
 
 #include <fs_info.h>
 #include <libs/iconv/iconv.h>
+#else
+#include <fssh_api_wrapper.h>
 #endif
 
 

src/add-ons/kernel/file_systems/fat/bsd/sys/param.h

@@ -39,12 +39,11 @@
 
 // Modified to support the Haiku FAT driver.
 
-#include <sys/time.h>
-
 #ifndef FS_SHELL
-#include <errno.h>
+#	include <errno.h>
-#include_next <sys/param.h>
+#	include <sys/time.h>
-#endif // !FS_SHELL
+#	include_next <sys/param.h>
+#endif
 
 #include "sys/types.h"
 

src/add-ons/kernel/file_systems/fat/debug.cpp

@@ -7,16 +7,13 @@
 
 #include "debug.h"
 
+#ifndef FS_SHELL
 #include <stdlib.h>
-
-#ifdef FS_SHELL
-#include "fssh_api_wrapper.h"
 #endif
 
 #define _KERNEL
 
-extern "C"
+extern "C" {
-{
 #include "sys/param.h"
 #include "sys/buf.h"
 #include "sys/conf.h"

src/add-ons/kernel/file_systems/fat/debug.h

@@ -8,6 +8,7 @@
 
 
 #ifdef FS_SHELL
+#include "sys/types.h"
 #include "fssh_api_wrapper.h"
 #else
 #include <stdio.h>

src/add-ons/kernel/file_systems/fat/encodings.cpp

@@ -5,20 +5,18 @@
 
 
 #include "encodings.h"
+#include "support.h"
 
 #include <ctype.h>
 #ifndef FS_SHELL
 #include <stdio.h>
-#endif // !FS_SHELL
 #include <stdlib.h>
 #include <string.h>
-
+#endif // !FS_SHELL
-#include "support.h"
 
 #define TOUCH(x) ((void)(x))
 
 #ifdef USER
-	#include <stdio.h>
 	#define dprintf printf
 	#undef DEBUG
 	int _assert_(char *,int,char *) {return 0;}

src/add-ons/kernel/file_systems/fat/encodings.h

@@ -11,6 +11,7 @@
 #else // FS_SHELL
 typedef unsigned char uchar;
 
+#include "sys/types.h"
 #include "fssh_api_wrapper.h"
 #endif // FS_SHELL
 

src/add-ons/kernel/file_systems/fat/fssh_defines.h

@@ -12,7 +12,7 @@
 
 
 #ifndef LONGLONG_MAX
-#define LONGLONG_MAX LONG_LONG_MAX
+#define LONGLONG_MAX LLONG_MAX
 #endif
 
 #ifdef B_USE_POSITIVE_POSIX_ERRORS

src/add-ons/kernel/file_systems/fat/kernel_interface.cpp

@@ -56,6 +56,7 @@
 
 
 #ifdef FS_SHELL
+#include "sys/types.h"
 #include "fssh_api_wrapper.h"
 #else // !FS_SHELL
 #include <dirent.h>

src/add-ons/kernel/file_systems/fat/mkdos.h

@@ -32,6 +32,7 @@ Copyright 2024, Haiku, Inc. All rights reserved.
 
 
 #ifdef FS_SHELL
+#include "sys/types.h"
 #include "fssh_api_wrapper.h"
 #else
 #include <SupportDefs.h>

src/add-ons/kernel/file_systems/fat/support.cpp

@@ -57,9 +57,7 @@
 
 #include "support.h"
 
-#ifdef FS_SHELL
+#ifndef FS_SHELL
-#include "fssh_api_wrapper.h"
-#else // !FS_SHELL
 #include <dirent.h>
 #include <malloc.h>
 

src/add-ons/kernel/file_systems/fat/support.h

@@ -60,14 +60,14 @@
 // Support functions for C++ driver code.
 
 #ifdef FS_SHELL
+#include "sys/types.h"
 #include "fssh_api_wrapper.h"
 #else
 #include <lock.h>
 #endif // FS_SHELL
 
 #define _KERNEL
-extern "C"
+extern "C" {
-{
 #include "sys/param.h"	
 #include "sys/buf.h"
 #include "sys/conf.h"

src/add-ons/kernel/file_systems/fat/vcache.cpp

@@ -43,22 +43,21 @@ without calling get_vnode().
 */
 
 
-#include "vcache.h"
-
 #ifdef FS_SHELL
+#include "sys/types.h"
 #include "fssh_api_wrapper.h"
 #else // !FS_SHELL
 #include <new>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#endif // !FS_SHELL
 
-#ifndef FS_SHELL
 #include <fs_cache.h>
 #include <fs_interface.h>
 #endif // !FS_SHELL
 
+#include "vcache.h"
+
 #define _KERNEL
 #include "sys/vnode.h"
 

src/add-ons/kernel/file_systems/fat/vcache.h

@@ -7,7 +7,9 @@
 #define _DOSFS_VCACHE_H_
 
 
+#ifndef FS_SHELL
 #include <sys/mount.h>
+#endif
 
 #include "dosfs.h"