mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	Merged revisions 262330 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r262330 | tilghman | 2010-05-11 12:23:51 -0500 (Tue, 11 May 2010) | 9 lines Merged revisions 262321 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r262321 | tilghman | 2010-05-11 12:22:07 -0500 (Tue, 11 May 2010) | 2 lines Fix issue #17302 a slightly different way (mad props to Qwell) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@262339 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -37,9 +37,6 @@ endif | ||||
|  | ||||
| OPTIMIZE?=-O6 | ||||
| ifneq ($(findstring darwin,$(OSARCH)),) | ||||
|   ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.4) | ||||
|     OPTIMIZE+=-fno-inline | ||||
|   endif | ||||
|   ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6) | ||||
|     # Snow Leopard has an issue with this optimization flag on large files (like chan_sip) | ||||
|     OPTIMIZE+=-fno-inline-functions | ||||
|   | ||||
| @@ -8259,6 +8259,7 @@ static int vm_intro(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm | ||||
|  | ||||
| 	/* Play voicemail intro - syntax is different for different languages */ | ||||
| 	if (0) { | ||||
| 		return 0; | ||||
| 	} else if (!strncasecmp(chan->language, "cs", 2)) {  /* CZECH syntax */ | ||||
| 		return vm_intro_cs(chan, vms); | ||||
| 	} else if (!strncasecmp(chan->language, "cz", 2)) {  /* deprecated CZECH syntax */ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user