diff options
| author | Alexander Bergmann <myaddons@gmx.de> | 2012-02-09 13:15:27 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-02-13 17:33:15 +0000 |
| commit | 8963cc01f5267f3afc4e4a4ff5a65a67520f447b (patch) | |
| tree | c1f058310dd7ac12ddc0546c5bd3f8fcdbbd1ab8 /sal | |
| parent | bbeb0f7a82945e8d7b98e5d5da9f69dfc5c6fabe (diff) | |
EasyHack: Removed gcc conditionals
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/inc/sal/types.h | 4 | ||||
| -rw-r--r-- | sal/osl/unx/file_stat.cxx | 8 | ||||
| -rw-r--r-- | sal/osl/unx/process_impl.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/unx/system.h | 3 |
4 files changed, 3 insertions, 14 deletions
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index f04c14cd0ff1..1bed00c105b4 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -308,7 +308,7 @@ typedef void * sal_Handle; Compilers that support a construct of this nature will emit a compile time warning on unchecked return value. */ -#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) +#if defined(__GNUC__) # define SAL_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #else # define SAL_WARN_UNUSED_RESULT @@ -453,7 +453,7 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) { #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) # define SAL_DEPRECATED(message) __attribute__((deprecated(message))) -#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) +#elif (__GNUC__) # define SAL_DEPRECATED(message) __attribute__((deprecated)) #elif defined(_MSC_VER) # define SAL_DEPRECATED(message) __declspec(deprecated(message)) diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx index 781d9995dd2d..3469e22cbaf9 100644 --- a/sal/osl/unx/file_stat.cxx +++ b/sal/osl/unx/file_stat.cxx @@ -224,11 +224,7 @@ oslFileError SAL_CALL osl_getFileStatus(oslDirectoryItem Item, oslFileStatus* pS if (osl_File_E_None != osl_error) return osl_error; -#if defined(__GNUC__) && (__GNUC__ < 3) - struct ::stat file_stat; -#else struct stat file_stat; -#endif bool bStatNeeded = is_stat_call_necessary(uFieldMask, pImpl->getFileType()); if (bStatNeeded && (0 != osl::lstat(file_path, file_stat))) @@ -460,11 +456,7 @@ SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a, oslDirectoryItem b) pB->m_ustrFilePath->buffer, pB->m_ustrFilePath->length ) == 0) return sal_True; -#if defined(__GNUC__) && (__GNUC__ < 3) - struct ::stat a_stat, b_stat; -#else struct stat a_stat, b_stat; -#endif if (osl::lstat(rtl::OUString(pA->m_ustrFilePath), a_stat) != 0 || osl::lstat(rtl::OUString(pB->m_ustrFilePath), b_stat) != 0) diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index 83c5c8872dbe..1582b581bf37 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -89,7 +89,7 @@ oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl ( char buffer[PATH_MAX]; size_t buflen = sizeof(buffer); -#if __GNUC__ >= 4 && defined(MACOSX) +#if defined(__GNUC__) && defined(MACOSX) if (_NSGetExecutablePath (buffer, (uint32_t*)&buflen) == 0) #else if (_NSGetExecutablePath (buffer, &buflen) == 0) diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h index 8df86203ca1f..576be1a09ee2 100644 --- a/sal/osl/unx/system.h +++ b/sal/osl/unx/system.h @@ -344,9 +344,6 @@ int macxp_resolveAlias(char *path, int buflen); # define PTHREAD_VALUE(t) (t) #endif #ifndef PTHREAD_NONE -# if (__GNUC__ < 4) && !defined(MACOSX) -extern pthread_t _pthread_none_; -# endif # define PTHREAD_NONE _pthread_none_ # ifndef PTHREAD_NONE_INIT # define PTHREAD_NONE_INIT ((pthread_t)-1) |