From 374fa7fc0859ba87c45096d0501691ec02b7230c Mon Sep 17 00:00:00 2001 From: DarkWyrm Date: Thu, 3 Aug 2006 18:28:52 +0000 Subject: [PATCH] Moved Haiku-specific defs for the Translation Kit to the proper file git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18377 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/build/HaikuBuildCompatibility.h | 12 ++++++++++++ src/add-ons/translators/shared/BaseTranslator.h | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/headers/build/HaikuBuildCompatibility.h b/headers/build/HaikuBuildCompatibility.h index 52ee207fc2..2c42c2dc76 100644 --- a/headers/build/HaikuBuildCompatibility.h +++ b/headers/build/HaikuBuildCompatibility.h @@ -49,5 +49,17 @@ extern float roundf(float value); #define B_REDO 'REDO' #endif +// These are R1-specific extensions +#ifndef HAIKU_TARGET_PLATFORM_HAIKU + +#define B_TRANSLATION_MAKE_VERSION(major,minor,revision) ((major << 8) | ((minor << 4) & 0xf0) | (revision & 0x0f)) +#define B_TRANSLATION_MAJOR_VERSION(v) (v >> 8) +#define B_TRANSLATION_MINOR_VERSION(v) ((v >> 4) & 0xf) +#define B_TRANSLATION_REVISION_VERSION(v) (v & 0xf) + +#define B_BAD_DATA (B_NOT_ALLOWED+1) + +#endif + #endif // HAIKU_BUILD_COMPATIBILITY_H diff --git a/src/add-ons/translators/shared/BaseTranslator.h b/src/add-ons/translators/shared/BaseTranslator.h index 80a08454bc..fc9c05d1be 100644 --- a/src/add-ons/translators/shared/BaseTranslator.h +++ b/src/add-ons/translators/shared/BaseTranslator.h @@ -50,18 +50,6 @@ #define max(a,b) ((a > b) ? (a) : (b)) #endif -// These are R1-specific extensions -#ifndef HAIKU_TARGET_PLATFORM_HAIKU - -#define B_TRANSLATION_MAKE_VERSION(major,minor,revision) ((major << 8) | ((minor << 4) & 0xf0) | (revision & 0x0f)) -#define B_TRANSLATION_MAJOR_VERSION(v) (v >> 8) -#define B_TRANSLATION_MINOR_VERSION(v) ((v >> 4) & 0xf) -#define B_TRANSLATION_REVISION_VERSION(v) (v & 0xf) - -#define B_BAD_DATA (B_NOT_ALLOWED+1) - -#endif - class BaseTranslator : public BTranslator { public: BaseTranslator(const char *name, const char *info,