[asterisk-commits] kpfleming: branch 1.6.0 r107463 - in /branches/1.6.0: ./ apps/ include/asterisk/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Tue Mar 11 09:37:23 2008
New Revision: 107463

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107463
Log:
Merged revisions 107462 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r107462 | kpfleming | 2008-03-11 09:37:03 -0500 (Tue, 11 Mar 2008) | 10 lines

Merged revisions 107461 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r107461 | kpfleming | 2008-03-11 09:33:45 -0500 (Tue, 11 Mar 2008) | 2 lines

stop checking for mktime() in the configure script... we don't use it, and the test is buggy under gcc 4.3

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_sms.c
    branches/1.6.0/configure
    branches/1.6.0/configure.ac
    branches/1.6.0/include/asterisk/autoconfig.h.in

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_sms.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_sms.c?view=diff&rev=107463&r1=107462&r2=107463
==============================================================================
--- branches/1.6.0/apps/app_sms.c (original)
+++ branches/1.6.0/apps/app_sms.c Tue Mar 11 09:37:23 2008
@@ -542,7 +542,7 @@
 		t.tm_min += 15 * ((i[6] & 0x7) * 10 + (i[6] >> 4));
 	else
 		t.tm_min -= 15 * ((i[6] & 0x7) * 10 + (i[6] >> 4));
-	return mktime(&t);
+	return ast_mktime(&t, NULL);
 }
 
 /*! \brief unpacks bytes (7 bit encoding) at i, len l septets, 

Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=107463&r1=107462&r2=107463
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Tue Mar 11 09:37:23 2008
@@ -302,7 +302,6 @@
 # AC_FUNC_MALLOC
 # AC_FUNC_REALLOC
 AC_FUNC_MEMCMP
-AC_FUNC_MKTIME
 AC_FUNC_MMAP
 AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_SETVBUF_REVERSED

Modified: branches/1.6.0/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/autoconfig.h.in?view=diff&rev=107463&r1=107462&r2=107463
==============================================================================
--- branches/1.6.0/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.0/include/asterisk/autoconfig.h.in Tue Mar 11 09:37:23 2008
@@ -29,9 +29,6 @@
 
 /* Define to indicate the ${ACOS_DESCRIP} library version */
 #undef HAVE_ACOS_VERSION
-
-/* Define to 1 if you have the `alarm' function. */
-#undef HAVE_ALARM
 
 /* Define to 1 if you have `alloca', as a function or macro. */
 #undef HAVE_ALLOCA