From f0d5e5b06264fc96566ec96049230de4404c73a3 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Sun, 18 Nov 2018 14:36:28 -0500
Subject: [PATCH] userlandfs: Fix the BeOS frontend on 64-bit.

---
 build/jam/packages/UserlandFS                                  | 2 +-
 src/add-ons/kernel/file_systems/userlandfs/server/beos/Jamfile | 2 ++
 src/add-ons/kernel/file_systems/userlandfs/server/beos/lock.h  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/jam/packages/UserlandFS b/build/jam/packages/UserlandFS
index 7f1c50a7d1..c702abbf0f 100644
--- a/build/jam/packages/UserlandFS
+++ b/build/jam/packages/UserlandFS
@@ -12,7 +12,7 @@ AddFilesToPackage servers : userlandfs_server ;
 
 # libs
 local userlandfsLibs = [ FFilterByBuildFeatures
-		libuserlandfs_beos_kernel.so@!x86_64
+		libuserlandfs_beos_kernel.so
 		libuserlandfs_haiku_kernel.so
 		libuserlandfs_fuse.so
 	]
diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/beos/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/server/beos/Jamfile
index 37868b1f90..d8f7741760 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/beos/Jamfile
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/beos/Jamfile
@@ -4,6 +4,8 @@ local userlandFSTop = [ FDirName $(HAIKU_TOP) src add-ons kernel
 	file_systems userlandfs ] ;
 local userlandFSIncludes = [ PrivateHeaders userlandfs ] ;
 
+SubDirCcFlags -Wno-error=format ;
+
 SubDirSysHdrs [ FDirName $(userlandFSIncludes) ] ;
 SubDirHdrs [ FDirName $(userlandFSIncludes) private ] ;
 SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ;
diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/beos/lock.h b/src/add-ons/kernel/file_systems/userlandfs/server/beos/lock.h
index 8e0e133e6b..98582c8dd7 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/beos/lock.h
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/beos/lock.h
@@ -24,7 +24,7 @@
 
 struct beos_lock {
 	sem_id		s;
-	long		c;
+	int32		c;
 };
 
 struct beos_mlock {