components/desktop/thunderbird/patches/thunderbird31-501-dup-ctime-def-removal.patch
equal
deleted
inserted
replaced
|
1 Fix for Solaris. |
|
2 This should be investigated for sending upstream. |
|
3 |
|
4 --- comm-esr31/ldap/sdks/c-sdk/ldap/libraries/libldap/tmplout.c.orig 2015-04-15 14:18:18.428844179 +0530 |
|
5 +++ comm-esr31/ldap/sdks/c-sdk/ldap/libraries/libldap/tmplout.c 2015-04-15 14:20:02.153860191 +0530 |
|
6 @@ -48,11 +48,6 @@ |
|
7 #endif |
|
8 |
|
9 |
|
10 -/* This is totally lame, since it should be coming from time.h, but isn't. */ |
|
11 -#if defined(SOLARIS) |
|
12 -char *ctime_r(const time_t *, char *, int); |
|
13 -#endif |
|
14 - |
|
15 static int do_entry2text( LDAP *ld, char *buf, char *base, LDAPMessage *entry, |
|
16 struct ldap_disptmpl *tmpl, char **defattrs, char ***defvals, |
|
17 writeptype writeproc, void *writeparm, char *eol, int rdncount, |
|
18 @@ -962,7 +957,7 @@ time2text( char *ldtimestr, int dateonly |
|
19 } |
|
20 |
|
21 gmttime = gtime( &t ); |
|
22 - timestr = NSLDAPI_CTIME( &gmttime, buf, sizeof(buf) ); |
|
23 + timestr = ctime_r( &gmttime, buf); |
|
24 |
|
25 timestr[ strlen( timestr ) - 1 ] = zone; /* replace trailing newline */ |
|
26 if ( dateonly ) { |