simplify autoconfig include mechanism (make tholo happy he can use lint again :-)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@32846 f38db490-d61c-443f-a65b-d21fe96a405b

14 files changed, 56 insertions, 56 deletions

diff --git a/formats/format_g723.c b/formats/format_g723.c
index 5de56d86c..6a371fc08 100644
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -25,6 +25,10 @@
  * \ingroup formats
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -34,10 +38,6 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
diff --git a/formats/format_g726.c b/formats/format_g726.c
index 61b06b47e..b0e123bbd 100644
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -28,6 +28,10 @@
  * \ingroup formats
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -37,10 +41,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
diff --git a/formats/format_g729.c b/formats/format_g729.c
index 387641e7a..0685d37a2 100644
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -26,6 +26,10 @@
  * \ingroup formats
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -35,10 +39,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index 46d943394..c31e8bbc8 100644
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -23,6 +23,10 @@
  * \ingroup formats
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -32,10 +36,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
diff --git a/formats/format_h263.c b/formats/format_h263.c
index 16b090c64..527bb70e0 100644
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -23,6 +23,10 @@
  * \ingroup formats
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -32,10 +36,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
diff --git a/formats/format_h264.c b/formats/format_h264.c
index 5c4ddf8f0..7d66f5fca 100644
--- a/formats/format_h264.c
+++ b/formats/format_h264.c
@@ -23,6 +23,10 @@
  * \ingroup formats
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -32,10 +36,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
index 154dc17ab..df95ea803 100644
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -25,6 +25,10 @@
  * \ingroup formats
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -34,10 +38,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c
index a66b21fbc..921dadf92 100644
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -24,6 +24,10 @@
  * \ingroup formats
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -34,10 +38,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index 97b1b4562..d3959745e 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -26,6 +26,10 @@
 	<depend>ogg</depend>
  ***/
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -44,10 +48,6 @@
 #include <fcntl.h>
 #endif
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index c2b626240..2d84851e9 100644
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -24,6 +24,10 @@
  * \ingroup formats
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -33,10 +37,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
diff --git a/formats/format_sln.c b/formats/format_sln.c
index 4a78aa900..0570e82e8 100644
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -22,6 +22,10 @@
  * \ingroup formats
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -31,10 +35,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
diff --git a/formats/format_vox.c b/formats/format_vox.c
index 8e5220143..170d73645 100644
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -24,6 +24,10 @@
  * \ingroup formats
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -33,10 +37,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
diff --git a/formats/format_wav.c b/formats/format_wav.c
index cc610ef53..823c220f9 100644
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -24,6 +24,10 @@
  * \ingroup formats
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -33,10 +37,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index d3abbd2f0..210158e83 100644
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -27,6 +27,10 @@
  * \ingroup formats
  */
  
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -36,10 +40,6 @@
 #include <errno.h>
 #include <string.h>
 
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"