From 3bf15c7f8615a19c5b04b678c167d4005356bf56 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 10 Nov 2018 15:01:45 -0500 Subject: [PATCH] shortcut_catcher: Remove non-Haiku code. --- .../filters/shortcut_catcher/BitFieldTesters.h | 15 +-------------- .../filters/shortcut_catcher/CommandActuators.h | 12 ------------ 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/src/add-ons/input_server/filters/shortcut_catcher/BitFieldTesters.h b/src/add-ons/input_server/filters/shortcut_catcher/BitFieldTesters.h index 51abedfde7..1170cff332 100644 --- a/src/add-ons/input_server/filters/shortcut_catcher/BitFieldTesters.h +++ b/src/add-ons/input_server/filters/shortcut_catcher/BitFieldTesters.h @@ -17,13 +17,6 @@ // This file contains various BitTester classes, each of which defines a // sequence of bit testing logics to do on a uint32. -#ifndef __HAIKU__ -#ifndef __INTEL__ -#pragma export on -#endif -#endif - - // The abstract base class. Defines the interface. _EXPORT class BitFieldTester; class BitFieldTester : public BArchivable { @@ -94,7 +87,7 @@ private: // The most interesting class: This one returns true if at least (minNum) of -// its slaves return true. It can be used for OR (i.e. minNum==1), AND +// its slaves return true. It can be used for OR (i.e. minNum==1), AND // (i.e. minNum==numberofchildren), or anything in between! _EXPORT class MinMatchFieldTester; class MinMatchFieldTester : public BitFieldTester { @@ -120,10 +113,4 @@ private: }; -#ifndef __HAIKU__ -#ifndef __INTEL__ -#pragma export reset -#endif -#endif - #endif // _BIT_FIELD_TESTERS_H diff --git a/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.h b/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.h index 38abb61b79..fe8a4810c9 100644 --- a/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.h +++ b/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.h @@ -15,12 +15,6 @@ #include #include -#ifndef __HAIKU__ -#ifndef __INTEL__ -#pragma export on -#endif -#endif - struct key_map; @@ -367,10 +361,4 @@ private: }; -#ifndef __HAIKU__ -#ifndef __INTEL__ -#pragma export reset -#endif -#endif - #endif // _COMMAND_ACTUATORS_H