From 3fd2e5ccb43a79e2c6dd13ec3c8306482aafb452 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 7 Mar 2007 08:02:32 +0000 Subject: [PATCH] r20337 broke the bfs_shell build (at least on Linux). Scary hack to fix it which shouldn't break the R5 build again. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20350 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile | 2 +- src/tests/add-ons/kernel/file_systems/bfs/r5/Query.cpp | 4 ++-- src/tests/add-ons/kernel/file_systems/bfs/r5/fsproto.h | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile index a1416f3085..f5836bef77 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile @@ -54,7 +54,7 @@ SYSHDRS = $(HAIKU_HDRS) ; fstat=build_platform_fstat read_pos=build_platform_read_pos ioctl=build_platform_ioctl - "send_notification\\(...\\)=" + MEAN_BFS_SHELL_SELECT_HACK=1 ; } diff --git a/src/tests/add-ons/kernel/file_systems/bfs/r5/Query.cpp b/src/tests/add-ons/kernel/file_systems/bfs/r5/Query.cpp index 06b9a29a04..89a0de0ad1 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/r5/Query.cpp +++ b/src/tests/add-ons/kernel/file_systems/bfs/r5/Query.cpp @@ -9,6 +9,8 @@ */ +#include "fsproto.h" // include first for hacky reasons + #include "Query.h" #include "bfs.h" #include "Debug.h" @@ -18,8 +20,6 @@ #include "BPlusTree.h" #include "Index.h" -#include "fsproto.h" - #include #include #include diff --git a/src/tests/add-ons/kernel/file_systems/bfs/r5/fsproto.h b/src/tests/add-ons/kernel/file_systems/bfs/r5/fsproto.h index 26ee10d1b4..091b9c56c6 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/r5/fsproto.h +++ b/src/tests/add-ons/kernel/file_systems/bfs/r5/fsproto.h @@ -6,6 +6,16 @@ #ifndef _FSPROTO_H #define _FSPROTO_H +// TODO: FIXME! XXX! DANGER! BIOHAZARD! +// OMG, we're defining COMPILE_FOR_R5 so that defines the +// obsolete notify_select_event() prototype. BTW, this happens only on +// non-BeOS-compatible host platforms. Outright scary! +#ifdef MEAN_BFS_SHELL_SELECT_HACK +# define COMPILE_FOR_R5 +# include +# undef COMPILE_FOR_R5 +#endif + #include #include #include