Index: lib/CMakeLists.txt
===================================================================
--- lib/CMakeLists.txt
+++ lib/CMakeLists.txt
@@ -6,7 +6,7 @@
   file(GLOB LIBCXX_WIN32_SOURCES ../src/support/win32/*.cpp)
   list(APPEND LIBCXX_SOURCES ${LIBCXX_WIN32_SOURCES})
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")
-  file(GLOB LIBCXX_SOLARIS_SOURCES ../src/support/solaris/*.c)
+  file(GLOB LIBCXX_SOLARIS_SOURCES ../src/support/solaris/*.cpp)
   list(APPEND LIBCXX_SOURCES ${LIBCXX_SOLARIS_SOURCES})
 endif()
 
Index: src/support/solaris/xlocale.cpp
===================================================================
--- src/support/solaris/xlocale.cpp
+++ src/support/solaris/xlocale.cpp
@@ -14,12 +14,13 @@
 #include <stdio.h>
 #include <sys/localedef.h>
 
+extern "C" {
 
 int isxdigit_l(int __c, locale_t __l) {
     return isxdigit(__c);
 }
 
-int iswxdigit_l(wchar_t __c, locale_t __l) {
+int iswxdigit_l(wint_t __c, locale_t __l) {
     return isxdigit(__c);
 }
 
@@ -63,4 +64,6 @@
   return localeconv();
 }
 
+};
+
 #endif // __sun__