another shot at the ftp_init() icc 9.1 optimizer issue

This commit is contained in:
Yang Tse 2010-03-18 17:37:00 +00:00
parent d9291eb4b8
commit 749fd2f9e9

View File

@ -2812,14 +2812,12 @@ static CURLcode ftp_easy_statemach(struct connectdata *conn)
#if defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 910) && \ #if defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 910) && \
defined(__OPTIMIZE__) && defined(__unix__) && defined(__i386__) defined(__OPTIMIZE__) && defined(__unix__) && defined(__i386__)
/* workaround icc 9.1 optimizer issue */ /* workaround icc 9.1 optimizer issue */
# define vqualifier volatile #pragma optimize("", off)
#else
# define vqualifier
#endif #endif
static CURLcode ftp_init(struct connectdata *conn) static CURLcode ftp_init(struct connectdata *conn)
{ {
struct FTP *vqualifier ftp; struct FTP *ftp;
if(NULL == conn->data->state.proto.ftp) { if(NULL == conn->data->state.proto.ftp) {
conn->data->state.proto.ftp = malloc(sizeof(struct FTP)); conn->data->state.proto.ftp = malloc(sizeof(struct FTP));
@ -2848,6 +2846,12 @@ static CURLcode ftp_init(struct connectdata *conn)
return CURLE_OK; return CURLE_OK;
} }
#if defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 910) && \
defined(__OPTIMIZE__) && defined(__unix__) && defined(__i386__)
/* workaround icc 9.1 optimizer issue */
#pragma optimize("", on)
#endif
/* /*
* ftp_connect() should do everything that is to be considered a part of * ftp_connect() should do everything that is to be considered a part of
* the connection phase. * the connection phase.