Ticket #7440: patch.txt

File patch.txt, 2.0 KB (added by Chris Stylianou <chris5287@…>, 9 years ago)
Line 
1Index: libs/filesystem/src/operations.cpp
2===================================================================
3--- libs/filesystem/src/operations.cpp (revision 84899)
4+++ libs/filesystem/src/operations.cpp (working copy)
5@@ -1408,7 +1408,7 @@
6 // - See the fchmodat() Linux man page:
7 // "http://man7.org/linux/man-pages/man2/fchmodat.2.html"
8 # if defined(AT_FDCWD) && defined(AT_SYMLINK_NOFOLLOW) \
9- && !(defined(__SUNPRO_CC) || defined(sun)) \
10+ && !(defined(__SUNPRO_CC) || defined(__sun) || defined(sun)) \
11 && !(defined(linux) || defined(__linux) || defined(__linux__))
12 if (::fchmodat(AT_FDCWD, p.c_str(), mode_cast(prms),
13 !(prms & symlink_perms) ? 0 : AT_SYMLINK_NOFOLLOW))
14Index: libs/locale/src/util/gregorian.cpp
15===================================================================
16--- libs/locale/src/util/gregorian.cpp (revision 84899)
17+++ libs/locale/src/util/gregorian.cpp (working copy)
18@@ -123,11 +123,7 @@
19 "JO","KE","KW","LY","MA","OM","QA","SA","SD","SO",
20 "SY","TN","YE"
21 };
22- // workaround for Sun Solaris !@#%@#$%@#$%234
23- #ifdef sun
24- #undef sun
25- #endif
26- static char const * const sun[] = {
27+ static char const * const sunday[] = {
28 "AR","AS","AZ","BW","CA","CN","FO","GE","GL","GU",
29 "HK","IL","IN","JM","JP","KG","KR","LA","MH","MN",
30 "MO","MP","MT","NZ","PH","PK","SG","TH","TT","TW",
31@@ -137,7 +133,7 @@
32 return 5; // fri
33 if(std::binary_search<char const * const *>(sat,sat+sizeof(sat)/(sizeof(sat[0])),terr,comparator))
34 return 6; // sat
35- if(std::binary_search<char const * const *>(sun,sun+sizeof(sun)/(sizeof(sun[0])),terr,comparator))
36+ if(std::binary_search<char const * const *>(sunday,sunday+sizeof(sunday)/(sizeof(sunday[0])),terr,comparator))
37 return 0; // sun
38 // default
39 return 1; // mon