From 4ae0cadb7f951691e2913a660a61d024d04b5485 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Tue, 5 Dec 2017 00:13:27 +0200
Subject: Renamed UserStringArrayOption to UserArrayOption for short.

---
 mesonbuild/compilers/c.py   | 10 +++++-----
 mesonbuild/compilers/cpp.py |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'mesonbuild/compilers')

diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index 2d12314..0f92e78 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -839,8 +839,8 @@ class GnuCCompiler(GnuCompiler, CCompiler):
                                                   'none')}
         if self.gcc_type == GCC_MINGW:
             opts.update({
-                'c_winlibs': coredata.UserStringArrayOption('c_winlibs', 'Standard Win libraries to link against',
-                                                            gnu_winlibs), })
+                'c_winlibs': coredata.UserArrayOption('c_winlibs', 'Standard Win libraries to link against',
+                                                      gnu_winlibs), })
         return opts
 
     def get_option_compile_args(self, options):
@@ -1012,9 +1012,9 @@ class VisualStudioCCompiler(CCompiler):
         return []
 
     def get_options(self):
-        return {'c_winlibs': coredata.UserStringArrayOption('c_winlibs',
-                                                            'Windows libs to link against.',
-                                                            msvc_winlibs)
+        return {'c_winlibs': coredata.UserArrayOption('c_winlibs',
+                                                      'Windows libs to link against.',
+                                                      msvc_winlibs)
                 }
 
     def get_option_link_args(self, options):
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index 48e6a51..cb4b055 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -110,7 +110,7 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler):
                                                            False)}
         if self.gcc_type == GCC_MINGW:
             opts.update({
-                'cpp_winlibs': coredata.UserStringArrayOption('cpp_winlibs', 'Standard Win libraries to link against',
+                'cpp_winlibs': coredata.UserArrayOption('cpp_winlibs', 'Standard Win libraries to link against',
                                                               gnu_winlibs), })
         return opts
 
@@ -188,9 +188,9 @@ class VisualStudioCPPCompiler(VisualStudioCCompiler, CPPCompiler):
                                                    'C++ exception handling type.',
                                                    ['none', 'a', 's', 'sc'],
                                                    'sc'),
-                'cpp_winlibs': coredata.UserStringArrayOption('cpp_winlibs',
-                                                              'Windows libs to link against.',
-                                                              msvc_winlibs)
+                'cpp_winlibs': coredata.UserArrayOption('cpp_winlibs',
+                                                        'Windows libs to link against.',
+                                                        msvc_winlibs)
                 }
 
     def get_option_compile_args(self, options):
-- 
cgit v1.1