[asterisk-commits] rizzo: branch rizzo/astobj2 r48556 - in /team/rizzo/astobj2: build_tools/ mai...

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Mon Dec 18 07:46:04 2006
New Revision: 48556

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48556
Log:
merge from trunk


Removed:
    team/rizzo/astobj2/build_tools/mkdep
Modified:
    team/rizzo/astobj2/main/stdtime/localtime.c

Modified: team/rizzo/astobj2/main/stdtime/localtime.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/astobj2/main/stdtime/localtime.c?view=diff&rev=48556&r1=48555&r2=48556
==============================================================================
--- team/rizzo/astobj2/main/stdtime/localtime.c (original)
+++ team/rizzo/astobj2/main/stdtime/localtime.c Mon Dec 18 07:46:04 2006
@@ -43,10 +43,6 @@
 #define TZ_STRLEN_MAX	255
 /* #define DEBUG */
 
-#include "asterisk.h"
- 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 /*LINTLIBRARY*/
 
 #include <sys/types.h>
@@ -58,9 +54,13 @@
 
 #include "private.h"
 #include "tzfile.h"
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/localtime.h"
-
 
 #ifndef lint
 #ifndef NOID