diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules index f8754025fe..e4803c77ff 100644 --- a/build/jam/ArchitectureRules +++ b/build/jam/ArchitectureRules @@ -131,6 +131,8 @@ rule ArchitectureSetup architecture # But these can stay. HAIKU_WERROR_FLAGS_$(architecture) += -Wno-error=cast-align -Wno-error=format-truncation ; + } else { + HAIKU_WERROR_FLAGS_$(architecture) += -Wno-unknown-pragmas ; } # debug flags @@ -150,11 +152,6 @@ rule ArchitectureSetup architecture # TODO: Temporary work-around. Should be defined in the compiler specs HAIKU_LINKFLAGS_$(architecture) += -Xlinker --no-undefined ; - if $(HAIKU_CC_IS_LEGACY_GCC_$(architecture)) = 1 { - HAIKU_DEFINES_$(architecture) += _BEOS_R5_COMPATIBLE_ ; - HAIKU_WERROR_FLAGS_$(architecture) += -Wno-unknown-pragmas ; - } - # private shared kernel/libroot headers HAIKU_PRIVATE_SYSTEM_HEADERS_$(architecture) = [ PrivateHeaders $(DOT) system system/arch/$(cpu) ] ; diff --git a/headers/private/net/r5_compatibility.h b/headers/private/net/r5_compatibility.h index 1fdcadb160..2a3bd65642 100644 --- a/headers/private/net/r5_compatibility.h +++ b/headers/private/net/r5_compatibility.h @@ -39,7 +39,7 @@ struct r5_sockaddr_in { }; -#ifdef _BEOS_R5_COMPATIBLE_ +#ifdef __HAIKU_BEOS_COMPATIBLE extern bool __gR5Compatibility; extern addr_t __gNetworkStart; extern addr_t __gNetworkEnd; diff --git a/src/add-ons/translators/icns/Jamfile b/src/add-ons/translators/icns/Jamfile index 5dce5804a7..820f1ccd5a 100644 --- a/src/add-ons/translators/icns/Jamfile +++ b/src/add-ons/translators/icns/Jamfile @@ -3,8 +3,6 @@ SubDir HAIKU_TOP src add-ons translators icns ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; #for BaseTranslator.h and friends -SubDirC++Flags [ FDefines BEOS_R5_COMPATIBLE ] ; - AddResources ICNSTranslator : ICNSTranslator.rdef ; diff --git a/src/add-ons/translators/jpeg2000/Jamfile b/src/add-ons/translators/jpeg2000/Jamfile index 09af12e5be..4baa622cb4 100644 --- a/src/add-ons/translators/jpeg2000/Jamfile +++ b/src/add-ons/translators/jpeg2000/Jamfile @@ -11,8 +11,6 @@ CCFLAGS += -DEXCLUDE_MIF_SUPPORT -DEXCLUDE_JPG_SUPPORT -DEXCLUDE_PGX_SUPPORT ; -SubDirC++Flags [ FDefines BEOS_R5_COMPATIBLE ] ; - AddResources JPEG2000Translator : JPEG2000Translator.rdef ; local architectureObject ; diff --git a/src/bin/error.c b/src/bin/error.c index eb6acd34b3..e10f8240a7 100644 --- a/src/bin/error.c +++ b/src/bin/error.c @@ -92,7 +92,7 @@ struct error_pair { E(B_ERRORS_END), E(B_FILE_ERROR), E(B_FILE_EXISTS), -#ifdef _BEOS_R5_COMPATIBLE_ +#ifdef __HAIKU_BEOS_COMPATIBLE #define B_FILE_NOT_FOUND (B_STORAGE_ERROR_BASE + 1) E(B_FILE_NOT_FOUND), #endif diff --git a/src/kits/app/Application.cpp b/src/kits/app/Application.cpp index d116fa60be..096f570902 100644 --- a/src/kits/app/Application.cpp +++ b/src/kits/app/Application.cpp @@ -291,7 +291,7 @@ BApplication::BApplication(BMessage* data) } -#ifdef _BEOS_R5_COMPATIBLE_ +#ifdef __HAIKU_BEOS_COMPATIBLE BApplication::BApplication(uint32 signature) { } diff --git a/src/kits/app/Looper.cpp b/src/kits/app/Looper.cpp index a153429aac..e1d6304d43 100644 --- a/src/kits/app/Looper.cpp +++ b/src/kits/app/Looper.cpp @@ -881,7 +881,7 @@ void BLooper::_ReservedLooper5() {} void BLooper::_ReservedLooper6() {} -#ifdef _BEOS_R5_COMPATIBLE_ +#ifdef __HAIKU_BEOS_COMPATIBLE BLooper::BLooper(const BLooper& other) { // Copy construction not allowed diff --git a/src/kits/app/MessageRunner.cpp b/src/kits/app/MessageRunner.cpp index be3f71d484..4c49ba15b7 100644 --- a/src/kits/app/MessageRunner.cpp +++ b/src/kits/app/MessageRunner.cpp @@ -168,7 +168,7 @@ void BMessageRunner::_ReservedMessageRunner5() {} void BMessageRunner::_ReservedMessageRunner6() {} -#ifdef _BEOS_R5_COMPATIBLE_ +#ifdef __HAIKU_BEOS_COMPATIBLE //! Privatized copy constructor to prevent usage. BMessageRunner::BMessageRunner(const BMessageRunner &) : diff --git a/src/kits/storage/AppFileInfo.cpp b/src/kits/storage/AppFileInfo.cpp index fa8b9425aa..e9cae1f782 100644 --- a/src/kits/storage/AppFileInfo.cpp +++ b/src/kits/storage/AppFileInfo.cpp @@ -958,7 +958,7 @@ void BAppFileInfo::_ReservedAppFileInfo2() {} void BAppFileInfo::_ReservedAppFileInfo3() {} -#ifdef _BEOS_R5_COMPATIBLE_ +#ifdef __HAIKU_BEOS_COMPATIBLE //! Privatized assignment operator to prevent usage. BAppFileInfo& BAppFileInfo::operator=(const BAppFileInfo&) diff --git a/src/kits/storage/MimeType.cpp b/src/kits/storage/MimeType.cpp index 8dd7a53709..822eb7dea3 100644 --- a/src/kits/storage/MimeType.cpp +++ b/src/kits/storage/MimeType.cpp @@ -1200,7 +1200,7 @@ void BMimeType::_ReservedMimeType2() {} void BMimeType::_ReservedMimeType3() {} -#ifdef _BEOS_R5_COMPATIBLE_ +#ifdef __HAIKU_BEOS_COMPATIBLE // assignment operator. // Unimplemented BMimeType& diff --git a/src/kits/storage/NodeInfo.cpp b/src/kits/storage/NodeInfo.cpp index aebb00b658..762b860c63 100644 --- a/src/kits/storage/NodeInfo.cpp +++ b/src/kits/storage/NodeInfo.cpp @@ -608,7 +608,7 @@ void BNodeInfo::_ReservedNodeInfo2() {} void BNodeInfo::_ReservedNodeInfo3() {} -#ifdef _BEOS_R5_COMPATIBLE_ +#ifdef __HAIKU_BEOS_COMPATIBLE /*! Assignment operator is declared private to prevent it from being created automatically by the compiler. */ diff --git a/src/system/glue/start_dyn.c b/src/system/glue/start_dyn.c index fee6c824f2..9a0cc0b04b 100644 --- a/src/system/glue/start_dyn.c +++ b/src/system/glue/start_dyn.c @@ -36,7 +36,7 @@ _start(int argc, char **argv, char **environment) argv_save = argv; __main_thread_id = find_thread(NULL); -#ifdef _BEOS_R5_COMPATIBLE_ +#ifdef __HAIKU_BEOS_COMPATIBLE // These two are called to make our glue code usable under BeOS R5 // - in Haiku, they are both empty. _init_c_library_(argc, argv, environment); diff --git a/src/system/libnetwork/init.cpp b/src/system/libnetwork/init.cpp index a9941ba1fa..bcc94c9f2e 100644 --- a/src/system/libnetwork/init.cpp +++ b/src/system/libnetwork/init.cpp @@ -16,7 +16,7 @@ #include -#ifdef _BEOS_R5_COMPATIBLE_ +#ifdef __HAIKU_BEOS_COMPATIBLE bool __gR5Compatibility = false; diff --git a/src/system/libroot/os/system_info.cpp b/src/system/libroot/os/system_info.cpp index 83741ab612..c9cde12289 100644 --- a/src/system/libroot/os/system_info.cpp +++ b/src/system/libroot/os/system_info.cpp @@ -15,7 +15,7 @@ #include -#if _BEOS_R5_COMPATIBLE_ +#if __HAIKU_BEOS_COMPATIBLE #define LEGACY_B_CPU_X86 15 @@ -143,7 +143,7 @@ _get_system_info(legacy_system_info* info, size_t size) } -#endif // _BEOS_R5_COMPATIBLE_ +#endif // __HAIKU_BEOS_COMPATIBLE status_t diff --git a/src/system/libroot/os/time.cpp b/src/system/libroot/os/time.cpp index 789c979be3..42648a8d3b 100644 --- a/src/system/libroot/os/time.cpp +++ b/src/system/libroot/os/time.cpp @@ -102,7 +102,7 @@ set_alarm(bigtime_t when, uint32 mode) } -#ifdef _BEOS_R5_COMPATIBLE_ +#ifdef __HAIKU_BEOS_COMPATIBLE extern "C" status_t set_timezone(const char* /*timezone*/) {