Index: libcxx/include/locale
===================================================================
--- libcxx/include/locale
+++ libcxx/include/locale
@@ -3560,7 +3560,11 @@
 
 template <class _CharT>
 typename messages<_CharT>::catalog
+#ifdef _LIBCPP_HAS_CATOPEN
 messages<_CharT>::do_open(const basic_string<char>& __nm, const locale&) const
+#else // !_LIBCPP_HAS_CATOPEN
+messages<_CharT>::do_open(const basic_string<char>&, const locale&) const
+#endif // _LIBCPP_HAS_CATOPEN
 {
 #ifdef _LIBCPP_HAS_CATOPEN
     catalog __cat = (catalog)catopen(__nm.c_str(), NL_CAT_LOCALE);
@@ -3574,8 +3578,12 @@
 
 template <class _CharT>
 typename messages<_CharT>::string_type
+#ifdef _LIBCPP_HAS_CATOPEN
 messages<_CharT>::do_get(catalog __c, int __set, int __msgid,
                          const string_type& __dflt) const
+#else // !_LIBCPP_HAS_CATOPEN
+messages<_CharT>::do_get(catalog, int, int, const string_type& __dflt) const
+#endif // _LIBCPP_HAS_CATOPEN
 {
 #ifdef _LIBCPP_HAS_CATOPEN
     string __ndflt;
@@ -3597,7 +3605,11 @@
 
 template <class _CharT>
 void
+#ifdef _LIBCPP_HAS_CATOPEN
 messages<_CharT>::do_close(catalog __c) const
+#else // !_LIBCPP_HAS_CATOPEN
+messages<_CharT>::do_close(catalog) const
+#endif // _LIBCPP_HAS_CATOPEN
 {
 #ifdef _LIBCPP_HAS_CATOPEN
     if (__c != -1)