Index: libs/filesystem/src/operations.cpp
===================================================================
--- libs/filesystem/src/operations.cpp  (revision 84899)
+++ libs/filesystem/src/operations.cpp  (working copy)
@@ -1408,7 +1408,7 @@
     //  - See the fchmodat() Linux man page:
     //   "http://man7.org/linux/man-pages/man2/fchmodat.2.html"
 #   if defined(AT_FDCWD) && defined(AT_SYMLINK_NOFOLLOW) \
-      && !(defined(__SUNPRO_CC) || defined(sun)) \
+      && !(defined(__SUNPRO_CC) || defined(__sun) || defined(sun)) \
       && !(defined(linux) || defined(__linux) || defined(__linux__))
       if (::fchmodat(AT_FDCWD, p.c_str(), mode_cast(prms),
            !(prms & symlink_perms) ? 0 : AT_SYMLINK_NOFOLLOW))
Index: libs/locale/src/util/gregorian.cpp
===================================================================
--- libs/locale/src/util/gregorian.cpp  (revision 84899)
+++ libs/locale/src/util/gregorian.cpp  (working copy)
@@ -123,11 +123,7 @@
                 "JO","KE","KW","LY","MA","OM","QA","SA","SD","SO",
                 "SY","TN","YE"
             };
-            // workaround for Sun Solaris !@#%@#$%@#$%234
-            #ifdef sun
-            #undef sun
-            #endif
-            static char const * const sun[] = {
+            static char const * const sunday[] = {
                 "AR","AS","AZ","BW","CA","CN","FO","GE","GL","GU",
                 "HK","IL","IN","JM","JP","KG","KR","LA","MH","MN",
                 "MO","MP","MT","NZ","PH","PK","SG","TH","TT","TW",
@@ -137,7 +133,7 @@
                 return 5; // fri
             if(std::binary_search<char const * const *>(sat,sat+sizeof(sat)/(sizeof(sat[0])),terr,comparator))
                 return 6; // sat
-            if(std::binary_search<char const * const *>(sun,sun+sizeof(sun)/(sizeof(sun[0])),terr,comparator))
+            if(std::binary_search<char const * const *>(sunday,sunday+sizeof(sunday)/(sizeof(sunday[0])),terr,comparator))
                 return 0; // sun
             // default
             return 1; // mon