| author | Stacy Yeh <stacy.yeh@oracle.com> |
| Tue, 19 Jul 2016 14:15:23 -0700 | |
| changeset 6431 | e4667e7df088 |
| parent 5527 | 611b2d6efdfe |
| permissions | -rw-r--r-- |
|
5527
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
5255
diff
changeset
|
1 |
In S12, ctime_r only takes 2 arguments. Fix for Solaris. |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
5255
diff
changeset
|
2 |
In S11, ctime_r still takes 3 arguments. We should eventually look into |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
5255
diff
changeset
|
3 |
modifying this patch with an ifdef for SOLARIS_11 since this will not work |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
5255
diff
changeset
|
4 |
on S11. |
|
5255
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
5 |
This should be investigated for sending upstream. |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
6 |
|
|
6431
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
5527
diff
changeset
|
7 |
--- a/ldap/c-sdk/libraries/libldap/tmplout.c.orig 2015-04-15 14:18:18.428844179 +0530 |
|
e4667e7df088
23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
5527
diff
changeset
|
8 |
+++ b/ldap/c-sdk/libraries/libldap/tmplout.c 2015-04-15 14:20:02.153860191 +0530 |
|
5255
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
9 |
@@ -48,11 +48,6 @@ |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
10 |
#endif |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
11 |
|
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
12 |
|
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
13 |
-/* This is totally lame, since it should be coming from time.h, but isn't. */ |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
14 |
-#if defined(SOLARIS) |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
15 |
-char *ctime_r(const time_t *, char *, int); |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
16 |
-#endif |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
17 |
- |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
18 |
static int do_entry2text( LDAP *ld, char *buf, char *base, LDAPMessage *entry, |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
19 |
struct ldap_disptmpl *tmpl, char **defattrs, char ***defvals, |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
20 |
writeptype writeproc, void *writeparm, char *eol, int rdncount, |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
21 |
@@ -962,7 +957,7 @@ time2text( char *ldtimestr, int dateonly |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
22 |
} |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
23 |
|
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
24 |
gmttime = gtime( &t ); |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
25 |
- timestr = NSLDAPI_CTIME( &gmttime, buf, sizeof(buf) ); |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
26 |
+ timestr = ctime_r( &gmttime, buf); |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
27 |
|
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
28 |
timestr[ strlen( timestr ) - 1 ] = zone; /* replace trailing newline */ |
|
cea0e462549a
22322082 Move Firefox/Thunderbird from Desktop consolidation to Userland
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
29 |
if ( dateonly ) {
|