Nuke COMPILE_FOR_R5.

Not used in $long_time, almost certainly broken, so it's just cruft.
This commit is contained in:
Augustin Cavalier
2017-11-15 17:52:27 +01:00
parent 304f594da1
commit 581cd2a22d
6 changed files with 69 additions and 95 deletions
-4
View File
@@ -31,11 +31,7 @@ enum select_events {
extern "C" { extern "C" {
#endif #endif
#ifdef COMPILE_FOR_R5
extern void notify_select_event(struct selectsync *sync, uint32 ref);
#else
extern status_t notify_select_event(struct selectsync *sync, uint32 ref, uint8 event); extern status_t notify_select_event(struct selectsync *sync, uint32 ref, uint8 event);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
+3 -5
View File
@@ -27,11 +27,9 @@ class BRect;
#define B_UTF8_TRADEMARK "\xE2\x84\xA2" #define B_UTF8_TRADEMARK "\xE2\x84\xA2"
#define B_UTF8_SMILING_FACE "\xE2\x98\xBB" #define B_UTF8_SMILING_FACE "\xE2\x98\xBB"
#define B_UTF8_HIROSHI "\xE5\xBC\x98" #define B_UTF8_HIROSHI "\xE5\xBC\x98"
#ifdef COMPILE_FOR_R5
#define B_MAX_MOUSE_BUTTONS 3
#else #define B_MAX_MOUSE_BUTTONS 16
#define B_MAX_MOUSE_BUTTONS 16
#endif
// Key definitions // Key definitions
@@ -3612,16 +3612,8 @@ send_notification(port_id port, long token, ulong what, long op, nspace_id nsida
#endif #endif
} }
#ifdef COMPILE_FOR_R5
void
notify_select_event(selectsync *sync, uint32 ref)
{
}
#else
status_t status_t
notify_select_event(selectsync *sync, uint32 ref, uint8 event) notify_select_event(selectsync *sync, uint32 ref, uint8 event)
{ {
return FS_UNSUPPORTED; return FS_UNSUPPORTED;
} }
#endif
@@ -1,9 +1,5 @@
SubDir HAIKU_TOP src tests servers input inputdevice ; SubDir HAIKU_TOP src tests servers input inputdevice ;
if $(COMPILE_FOR_R5) {
SubDirC++Flags -DCOMPILE_FOR_R5 ;
}
UsePrivateHeaders input ; UsePrivateHeaders input ;
SimpleTest input_device_test : SimpleTest input_device_test :
-4
View File
@@ -7,10 +7,6 @@ UsePrivateHeaders [ FDirName servers app ] ;
AddResources KeymapTest : Keymap.rdef ; AddResources KeymapTest : Keymap.rdef ;
if $(COMPILE_FOR_R5) {
SubDirC++Flags -DCOMPILE_FOR_R5 ;
}
SimpleTest KeymapTest : SimpleTest KeymapTest :
KeymapApplication.cpp KeymapApplication.cpp
KeymapWindow.cpp KeymapWindow.cpp
@@ -4,10 +4,6 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers input ] ;
UsePrivateHeaders input ; UsePrivateHeaders input ;
AddResources ReplicantTest : replicant.rdef ; AddResources ReplicantTest : replicant.rdef ;
if $(COMPILE_FOR_R5) {
SubDirC++Flags -DCOMPILE_FOR_R5 ;
}
SimpleTest ReplicantTest : SimpleTest ReplicantTest :
MethodReplicant.cpp MethodReplicant.cpp
MethodMenuItem.cpp MethodMenuItem.cpp