kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 48906 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48906 | qwell | 2006-12-22 16:33:46 -0600 (Fri, 22 Dec 2006) | 2 lines

Minor fixes for Solaris.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48907 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2006-12-22 22:34:31 +00:00
parent a01ae565e9
commit 05d6c4a2d0
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -58,6 +58,7 @@ export PROC
export SOLINK export SOLINK
export STRIP export STRIP
export DOWNLOAD export DOWNLOAD
export OSARCH
# even though we could use '-include makeopts' here, use a wildcard # even though we could use '-include makeopts' here, use a wildcard
# lookup anyway, so that make won't try to build makeopts if it doesn't # lookup anyway, so that make won't try to build makeopts if it doesn't

4
main/stdtime/localtime.c
View File

@@ -1216,11 +1216,7 @@ const time_t * const timep;
char *buf; char *buf;
{ {
struct tm tm; struct tm tm;
#ifdef SOLARIS
return asctime_r(localtime_r(timep, &tm), buf, 256);
#else
return asctime_r(localtime_r(timep, &tm), buf); return asctime_r(localtime_r(timep, &tm), buf);
#endif
} }
/* /*