diff options
author | Sinan Kaya <41809318+franksinankaya@users.noreply.github.com> | 2019-02-20 11:59:22 -0500 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2019-02-20 08:59:22 -0800 |
commit | 1a1bb292ab53c0c30d35dc396c7089c1da5b3c82 (patch) | |
tree | bd590b373c55ad23997b9cdd3979951479d5beaf /src/pal/inc/pal.h | |
parent | 3c2e989c61c7466bc6d061e03277dbbd8a7e54e9 (diff) | |
download | coreclr-1a1bb292ab53c0c30d35dc396c7089c1da5b3c82.tar.gz coreclr-1a1bb292ab53c0c30d35dc396c7089c1da5b3c82.tar.bz2 coreclr-1a1bb292ab53c0c30d35dc396c7089c1da5b3c82.zip |
Abstract deprecated and selectany for GCC and remove LLVM'ism where possible (#22662)
* Abstract selectany
* Fix initializer element is not constant
src/corefx/System.Globalization.Native/pal_icushim.c:58:34: error: initializer element is not constant
static const int MaxICUVersion = MinICUVersion + 20;
* Enable ms extensions
* Apply LLVM patterns to GCC
* Remove deprecated function
* Fix const conversion error
src/corefx/System.Globalization.Native/pal_calendarData.c:390:16: warning: passing argument 1 of ‘ures_close_ptr’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
ures_close(erasResBundle);
src/corefx/System.Globalization.Native/pal_calendarData.c:419:22: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
char* name = GetCalendarName(calendarId);
* Remove old compiler option
Diffstat (limited to 'src/pal/inc/pal.h')
-rw-r--r-- | src/pal/inc/pal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pal/inc/pal.h b/src/pal/inc/pal.h index 0422a8886e..cdb376068e 100644 --- a/src/pal/inc/pal.h +++ b/src/pal/inc/pal.h @@ -160,7 +160,7 @@ typedef PVOID NATIVE_LIBRARY_HANDLE; #endif // CORECLR #endif // !_MSC_VER -#if defined(_MSC_VER) || defined(__llvm__) +#if defined(_MSC_VER) #define DECLSPEC_ALIGN(x) __declspec(align(x)) #else #define DECLSPEC_ALIGN(x) __attribute__ ((aligned(x))) @@ -612,11 +612,11 @@ MessageBoxW( // From win32.h #ifndef _CRTIMP -#ifdef __llvm__ +#ifdef __GNUC__ #define _CRTIMP -#else // __llvm__ +#else // __GNUC__ #define _CRTIMP __declspec(dllimport) -#endif // __llvm__ +#endif // __GNUC__ #endif // _CRTIMP /******************* winbase.h Entrypoints and defines ************************/ |