diff --git a/src/common/list.cpp b/src/common/list.cpp
index 6a32377fb4..42368c0e51 100644
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -654,13 +654,19 @@ wxStringList::wxStringList (const wxChar *first, ...)
   {
       Add(s);
 
-      s = va_arg(ap, const wxChar *);
-      //    if (s == NULL)
-#ifdef __WXMSW__
-      if ((int)(long) s == 0)
-#else
-      if ((long) s == 0)
+      // icc gives this warning in its own va_arg() macro, argh
+#ifdef __INTELC__
+    #pragma warning(push)
+    #pragma warning(disable: 1684)
 #endif
+
+      s = va_arg(ap, const wxChar *);
+
+#ifdef __INTELC__
+    #pragma warning(pop)
+#endif
+
+      if ( !s )
           break;
   }
 
diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index cdf3108be8..4afd332148 100644
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -81,7 +81,17 @@ wxFileTypeInfo::wxFileTypeInfo(const wxChar *mimeType,
 
     for ( ;; )
     {
+        // icc gives this warning in its own va_arg() macro, argh
+#ifdef __INTELC__
+    #pragma warning(push)
+    #pragma warning(disable: 1684)
+#endif
+
         const wxChar *ext = va_arg(argptr, const wxChar *);
+
+#ifdef __INTELC__
+    #pragma warning(pop)
+#endif
         if ( !ext )
         {
             // NULL terminates the list