Merge source cleanups (bug #1911)

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

1 files changed, 25 insertions, 16 deletions

diff --git a/codecs/lpc10/synths.c b/codecs/lpc10/synths.c
index 369e6d662..736d54b65 100755
--- a/codecs/lpc10/synths.c
+++ b/codecs/lpc10/synths.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.16  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.15  2003/09/27 02:45:37  markster
 Fix various compiler warnings (bug #322)
 
@@ -27,6 +30,13 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+/*  -- translated by f2c (version 19951025).
+   You must link the resulting object file with the libraries:
+	-lf2c -lm   (in that order)
+*/
+
+#include "f2c.h"
+
 #ifdef P_R_O_T_O_T_Y_P_E_S
 extern int synths_(integer *voice, integer *pitch, real *rms, real *rc, real *speech, integer *k, struct lpc10_decoder_state *st);
 /* comlen contrl_ 12 */
@@ -39,13 +49,6 @@ extern int synths_(integer *voice, integer *pitch, real *rms, real *rc, real *sp
 /*:ref: initdeemp_ 14 0 */
 #endif
 
-/*  -- translated by f2c (version 19951025).
-   You must link the resulting object file with the libraries:
-	-lf2c -lm   (in that order)
-*/
-
-#include "f2c.h"
-
 /* Common Block Declarations */
 
 extern struct {
@@ -64,9 +67,12 @@ static real c_b2 = .7f;
 /* 	SYNTHS Version 54 */
 
 /* $Log$
- * Revision 1.15  2003/09/27 02:45:37  markster
- * Fix various compiler warnings (bug #322)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/09/27 02:45:37  markster
+/* Fix various compiler warnings (bug #322)
+/*
 /* Revision 1.2  2003/09/27 02:45:37  markster
 /* Fix various compiler warnings (bug #322)
 /*
@@ -179,9 +185,6 @@ static real c_b2 = .7f;
     extern /* Subroutine */ int deemp_(real *, integer *, struct lpc10_decoder_state *);
     real ratio;
     integer ipiti[16];
-    extern /* Subroutine */ void bsynz_(real *, integer *, 
-	    integer *, real *, real *, real *, real *, struct lpc10_decoder_state *), irc2pc_(real *, real *
-	    , integer *, real *, real *);
     real g2pass;
     real pc[10];
     extern /* Subroutine */ int pitsyn_(integer *, integer *, integer *, real 
@@ -190,9 +193,12 @@ static real c_b2 = .7f;
     real rci[160]	/* was [10][16] */;
 
 /* $Log$
- * Revision 1.15  2003/09/27 02:45:37  markster
- * Fix various compiler warnings (bug #322)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/09/27 02:45:37  markster
+/* Fix various compiler warnings (bug #322)
+/*
 /* Revision 1.2  2003/09/27 02:45:37  markster
 /* Fix various compiler warnings (bug #322)
 /*
@@ -227,9 +233,12 @@ static real c_b2 = .7f;
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
 /* $Log$
- * Revision 1.15  2003/09/27 02:45:37  markster
- * Fix various compiler warnings (bug #322)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/09/27 02:45:37  markster
+/* Fix various compiler warnings (bug #322)
+/*
 /* Revision 1.2  2003/09/27 02:45:37  markster
 /* Fix various compiler warnings (bug #322)
 /*