aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2010-03-18 17:37:00 +0000
committerYang Tse <yangsita@gmail.com>2010-03-18 17:37:00 +0000
commit749fd2f9e91f34763516624b2a66d72d69430bea (patch)
tree75eb3134fa261f5b8bf272e02bc62134961b865c
parentd9291eb4b8fbb591321760d7dfcc514c14ce4e35 (diff)
another shot at the ftp_init() icc 9.1 optimizer issue
-rw-r--r--lib/ftp.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/ftp.c b/lib/ftp.c
index 552ecf8ee..59012dc1a 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -2812,14 +2812,12 @@ static CURLcode ftp_easy_statemach(struct connectdata *conn)
#if defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 910) && \
defined(__OPTIMIZE__) && defined(__unix__) && defined(__i386__)
/* workaround icc 9.1 optimizer issue */
-# define vqualifier volatile
-#else
-# define vqualifier
+#pragma optimize("", off)
#endif
static CURLcode ftp_init(struct connectdata *conn)
{
- struct FTP *vqualifier ftp;
+ struct FTP *ftp;
if(NULL == conn->data->state.proto.ftp) {
conn->data->state.proto.ftp = malloc(sizeof(struct FTP));
@@ -2848,6 +2846,12 @@ static CURLcode ftp_init(struct connectdata *conn)
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
* the connection phase.