BLD: some fixes for Intel compilers.

- Fix an incorrect import
- Enable C99 complex support (Qstd=c99)
- Don't use MSVC complex types for Intel compilers

Thanks to Intel for this patch (contact: Yolanda Chen).

1 files changed, 5 insertions, 4 deletions

diff --git a/numpy/distutils/intelccompiler.py b/numpy/distutils/intelccompiler.py
index aed652ee6..25ee0e998 100644
--- a/numpy/distutils/intelccompiler.py
+++ b/numpy/distutils/intelccompiler.py
@@ -2,7 +2,7 @@ from __future__ import division, absolute_import, print_function
 
 from distutils.unixccompiler import UnixCCompiler
 from numpy.distutils.exec_command import find_executable
-from numpy.distutils.msvc9compiler import MSVCCompiler
+from distutils.msvc9compiler import MSVCCompiler
 from numpy.distutils.ccompiler import simple_version_match
 
 
@@ -40,6 +40,7 @@ class IntelEM64TCCompiler(UnixCCompiler):
     compiler_type = 'intelem'
     cc_exe = 'icc -m64 -fPIC'
     cc_args = "-fPIC"
+
     def __init__(self, verbose=0, dry_run=0, force=0):
         UnixCCompiler.__init__(self, verbose, dry_run, force)
         self.cc_exe = 'icc -m64 -fPIC'
@@ -66,9 +67,9 @@ class IntelCCompilerW(MSVCCompiler):
         MSVCCompiler.initialize(self, plat_name)
         self.cc = self.find_exe("icl.exe")
         self.linker = self.find_exe("xilink")
-        self.compile_options = ['/nologo', '/O3', '/MD', '/W3']
-        self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3', '/Z7',
-                                      '/D_DEBUG']
+        self.compile_options = ['/nologo', '/O3', '/MD', '/W3', '/Qstd=c99']
+        self.compile_options_debug = ['/nologo', '/Od', '/MDd', '/W3',
+                                      '/Qstd=c99', '/Z7', '/D_DEBUG']
 
 
 class IntelEM64TCCompilerW(IntelCCompilerW):