mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-29 15:36:13 +00:00 
			
		
		
		
	Merged revisions 48906 via svnmerge from
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:
		
							
								
								
									
										1
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								Makefile
									
									
									
									
									
								
							| @@ -58,6 +58,7 @@ export PROC | ||||
| export SOLINK | ||||
| export STRIP | ||||
| export DOWNLOAD | ||||
| export OSARCH | ||||
|  | ||||
| # 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 | ||||
|   | ||||
| @@ -1216,11 +1216,7 @@ const time_t * const	timep; | ||||
| char *buf; | ||||
| { | ||||
|         struct tm tm; | ||||
| #ifdef SOLARIS | ||||
| 	return asctime_r(localtime_r(timep, &tm), buf, 256); | ||||
| #else | ||||
| 	return asctime_r(localtime_r(timep, &tm), buf); | ||||
| #endif | ||||
| } | ||||
|  | ||||
| /* | ||||
|   | ||||
		Reference in New Issue
	
	Block a user