diff options
| author | Jan Dubois <jand@activestate.com> | 2012-07-30 16:08:01 -0700 |
|---|---|---|
| committer | Jan Dubois <jand@activestate.com> | 2012-07-30 16:09:00 -0700 |
| commit | 03c98af06fb1276cf98494ab176371eeabcdc5a2 (patch) | |
| tree | b80d5b96a3ef134d18ad1a34a84a61872d19caff /win32/win32.h | |
| parent | 5fde9fa4cbe66ffa73af8a18a5042cb511c581a4 (diff) | |
| download | perl-03c98af06fb1276cf98494ab176371eeabcdc5a2.tar.gz | |
Split __declspec(dllimport,noreturn) into 2 parts
I thought I did test commit 12a2785c with VC6 and it built without
errors, but I can no longer reproduce this. Checking standard
CRT headers shows common usage (e.g. for longjmp() in setjmp.h) is
"__declspec(dllimport) __declspec(noreturn)", so let's use that
one instead.
Diffstat (limited to 'win32/win32.h')
| -rwxr-xr-x[-rw-r--r--] | win32/win32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/win32.h b/win32/win32.h index 2c821eb24e..877db5f70b 100644..100755 --- a/win32/win32.h +++ b/win32/win32.h @@ -67,12 +67,12 @@ # ifdef __cplusplus # define PERL_CALLCONV extern "C" __declspec(dllimport) # ifdef _MSC_VER -# define PERL_CALLCONV_NO_RET extern "C" __declspec(dllimport, noreturn) +# define PERL_CALLCONV_NO_RET extern "C" __declspec(dllimport) __declspec(noreturn) # endif # else # define PERL_CALLCONV __declspec(dllimport) # ifdef _MSC_VER -# define PERL_CALLCONV_NO_RET __declspec(dllimport, noreturn) +# define PERL_CALLCONV_NO_RET __declspec(dllimport) __declspec(noreturn) # endif # endif #endif |