Merge source cleanups (bug #1911)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3311 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2025-09-29 18:19:30 +00:00 · 2004-06-26 03:50:14 +00:00
parent a30ae193db
commit 3db853b428
41 changed files with 699 additions and 342 deletions
--- a/codecs/lpc10/analys.c
+++ b/codecs/lpc10/analys.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/19 01:20:22  markster
 Code cleanups (bug #66)

@@ -27,6 +30,8 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

+#include "f2c.h"
+
 #ifdef P_R_O_T_O_T_Y_P_E_S
 extern int analys_(real *speech, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_encoder_state *st);
 /* comlen contrl_ 12 */
@@ -55,8 +60,6 @@ extern int analys_(real *speech, integer *voice, integer *pitch, real *rms, real
 	-lf2c -lm   (in that order)
 */

-#include "f2c.h"
-
 /* Common Block Declarations */

 extern struct {
@@ -85,9 +88,12 @@ static integer c__1 = 1;
 /* 	ANALYS Version 55 */

 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*
@@ -234,13 +240,7 @@ static integer c__1 = 1;
    extern /* Subroutine */ int onset_(real *, integer *, integer *, integer *
 	    , integer *, integer *, integer *, struct lpc10_encoder_state *);
    integer *osptr;
-    extern /* Subroutine */ void placea_(integer *, integer *
-	    , integer *, integer *, integer *, integer *, integer *, integer *
-	    , integer *);
-    extern void dcbias_(integer *, real *, real *);
-    extern void placev_(integer 
-	    *, integer *, integer *, integer *, integer *, integer *, integer 
-	    *, integer *, integer *, integer *, integer *);
+    extern int dcbias_(integer *, real *, real *);
    integer ipitch;
    integer *obound;
    extern /* Subroutine */ int preemp_(real *, real *, integer *, real *, 
@@ -260,9 +260,12 @@ static integer c__1 = 1;
    real phi[100]	/* was [10][10] */, psi[10];

 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*
@@ -297,9 +300,12 @@ static integer c__1 = 1;
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments to ANALYS */
 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*
--- a/codecs/lpc10/bsynz.c
+++ b/codecs/lpc10/bsynz.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:14  matteo
 mer feb 12 14:56:57 CET 2003

@@ -24,12 +27,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int bsynz_(real *coef, integer *ip, integer *iv, real *sout, real *rms, real *ratio, real *g2pass, struct lpc10_decoder_state *st);
-/* comlen contrl_ 12 */
-/*:ref: random_ 4 0 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -37,6 +34,12 @@ extern int bsynz_(real *coef, integer *ip, integer *iv, real *sout, real *rms, r

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int bsynz_(real *coef, integer *ip, integer *iv, real *sout, real *rms, real *ratio, real *g2pass, struct lpc10_decoder_state *st);
+/* comlen contrl_ 12 */
+/*:ref: random_ 4 0 */
+#endif
+
 /* Common Block Declarations */

 extern struct {
@@ -51,9 +54,12 @@ extern struct {
 /* 	BSYNZ Version 54 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:14  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:14  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -150,9 +156,12 @@ extern struct {
    real lpi0, hpi0;

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:14  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:14  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -184,9 +193,12 @@ extern struct {
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:14  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:14  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/chanwr.c
+++ b/codecs/lpc10/chanwr.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:14  matteo
 mer feb 12 14:56:57 CET 2003

@@ -21,11 +24,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int chanwr_(integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits, struct lpc10_encoder_state *st);
-extern int chanrd_(integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -38,9 +36,12 @@ extern int chanrd_(integer *order, integer *ipitv, integer *irms, integer *irc,
 /* 	CHANL Version 49 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:14  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:14  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/dcbias.c
+++ b/codecs/lpc10/dcbias.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:14  matteo
 mer feb 12 14:56:57 CET 2003

@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int dcbias_(integer *len, real *speech, real *sigout);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -27,14 +26,21 @@ extern int dcbias_(integer *len, real *speech, real *sigout);

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int dcbias_(integer *len, real *speech, real *sigout);
+#endif
+
 /* ********************************************************************* */

 /* 	DCBIAS Version 50 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:14  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:14  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/decode.c
+++ b/codecs/lpc10/decode.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/19 01:20:22  markster
 Code cleanups (bug #66)

@@ -27,13 +30,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_decoder_state *st);
-/* comlen contrl_ 12 */
-/*:ref: ham84_ 14 3 4 4 4 */
-/*:ref: median_ 4 3 4 4 4 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -41,6 +37,13 @@ extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice,

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_decoder_state *st);
+/* comlen contrl_ 12 */
+/*:ref: ham84_ 14 3 4 4 4 */
+/*:ref: median_ 4 3 4 4 4 */
+#endif
+
 /* Common Block Declarations */

 extern struct {
@@ -59,9 +62,12 @@ static integer c__2 = 2;
 /* 	DECODE Version 54 */

 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*
@@ -200,9 +206,12 @@ static integer c__2 = 2;
    integer ishift, errcnt, lsb;

 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*
@@ -237,9 +246,12 @@ static integer c__2 = 2;
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*
--- a/codecs/lpc10/deemp.c
+++ b/codecs/lpc10/deemp.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:14  matteo
 mer feb 12 14:56:57 CET 2003

@@ -24,10 +27,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int deemp_(real *x, integer *n, struct lpc10_decoder_state *st);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -35,14 +34,21 @@ extern int deemp_(real *x, integer *n, struct lpc10_decoder_state *st);

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int deemp_(real *x, integer *n, struct lpc10_decoder_state *st);
+#endif
+
 /* ***************************************************************** */

 /* 	DEEMP Version 48 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:14  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:14  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/difmag.c
+++ b/codecs/lpc10/difmag.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:14  matteo
 mer feb 12 14:56:57 CET 2003

@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau, integer *maxlag, real *amdf, integer *minptr, integer *maxptr);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -27,14 +26,21 @@ extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau, in

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau, integer *maxlag, real *amdf, integer *minptr, integer *maxptr);
+#endif
+
 /* ********************************************************************** */

 /* 	DIFMAG Version 49 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:14  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:14  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/dyptrk.c
+++ b/codecs/lpc10/dyptrk.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -24,11 +27,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int dyptrk_(real *amdf, integer *ltau, integer *minptr, integer *voice, integer *pitch, integer *midx, struct lpc10_encoder_state *st);
-/* comlen contrl_ 12 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -36,6 +34,11 @@ extern int dyptrk_(real *amdf, integer *ltau, integer *minptr, integer *voice, i

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int dyptrk_(real *amdf, integer *ltau, integer *minptr, integer *voice, integer *pitch, integer *midx, struct lpc10_encoder_state *st);
+/* comlen contrl_ 12 */
+#endif
+
 /* Common Block Declarations */

 extern struct {
@@ -50,9 +53,12 @@ extern struct {
 /* 	DYPTRK Version 52 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -142,9 +148,12 @@ extern struct {

 /*       Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/encode.c
+++ b/codecs/lpc10/encode.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -16,11 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int encode_(integer *voice, integer *pitch, real *rms, real *rc, integer *ipitch, integer *irms, integer *irc);
-/* comlen contrl_ 12 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -28,6 +26,11 @@ extern int encode_(integer *voice, integer *pitch, real *rms, real *rc, integer

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int encode_(integer *voice, integer *pitch, real *rms, real *rc, integer *ipitch, integer *irms, integer *irc);
+/* comlen contrl_ 12 */
+#endif
+
 /* Common Block Declarations */

 extern struct {
@@ -46,9 +49,12 @@ static integer c__2 = 2;
 /* 	ENCODE Version 54 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -134,9 +140,12 @@ static integer c__2 = 2;
    integer idel, nbit, i__, j, i2, i3, mrk;

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -160,9 +169,12 @@ static integer c__2 = 2;
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/energy.c
+++ b/codecs/lpc10/energy.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int energy_(integer *len, real *speech, real *rms);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -27,14 +26,21 @@ extern int energy_(integer *len, real *speech, real *rms);

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int energy_(integer *len, real *speech, real *rms);
+#endif
+
 /* ********************************************************************* */

 /* 	ENERGY Version 50 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/f2c.h
+++ b/codecs/lpc10/f2c.h
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -212,17 +215,17 @@ typedef shortlogical (*K_fp)(...);
 typedef /* Character */ VOID (*H_fp)(...);
 typedef /* Subroutine */ int (*S_fp)(...);
 #else
-typedef int /* Unknown procedure type */ (*U_fp)();
-typedef shortint (*J_fp)();
-typedef integer (*I_fp)();
-typedef real (*R_fp)();
-typedef doublereal (*D_fp)(), (*E_fp)();
-typedef /* Complex */ VOID (*C_fp)();
-typedef /* Double Complex */ VOID (*Z_fp)();
-typedef logical (*L_fp)();
-typedef shortlogical (*K_fp)();
-typedef /* Character */ VOID (*H_fp)();
-typedef /* Subroutine */ int (*S_fp)();
+typedef int /* Unknown procedure type */ (*U_fp)(VOID);
+typedef shortint (*J_fp)(VOID);
+typedef integer (*I_fp)(VOID);
+typedef real (*R_fp)(VOID);
+typedef doublereal (*D_fp)(VOID), (*E_fp)(VOID);
+typedef /* Complex */ VOID (*C_fp)(VOID);
+typedef /* Double Complex */ VOID (*Z_fp)(VOID);
+typedef logical (*L_fp)(VOID);
+typedef shortlogical (*K_fp)(VOID);
+typedef /* Character */ VOID (*H_fp)(VOID);
+typedef /* Subroutine */ int (*S_fp)(VOID);
 #endif
 /* E_fp is for real functions when -R is not specified */
 typedef VOID C_f;	/* complex function */
@@ -252,4 +255,71 @@ typedef doublereal E_f;	/* real function with -R not specified */
 #undef unix
 #undef vax
 #endif
+
+#ifdef KR_headers
+extern integer pow_ii(ap, bp);
+extern double r_sign(a,b);
+extern integer i_nint(x);
+#else
+extern integer pow_ii(integer *ap, integer *bp);
+extern double r_sign(real *a, real *b);
+extern integer i_nint(real *x);
+
 #endif
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int bsynz_(real *coef, integer *ip, integer *iv, 
+                  real *sout, real *rms, real *ratio, real *g2pass,
+                  struct lpc10_decoder_state *st);
+extern int chanwr_(integer *order, integer *ipitv, integer *irms,
+                   integer *irc, integer *ibits, struct lpc10_encoder_state *st);
+extern int chanrd_(integer *order, integer *ipitv, integer *irms,
+                   integer *irc, integer *ibits);
+extern int chanwr_0_(int n__, integer *order, integer *ipitv, 
+                     integer *irms, integer *irc, integer *ibits,
+                     struct lpc10_encoder_state *st);
+extern int dcbias_(integer *len, real *speech, real *sigout);
+extern int decode_(integer *ipitv, integer *irms, integer *irc, 
+                   integer *voice, integer *pitch, real *rms,
+                   real *rc, struct lpc10_decoder_state *st);
+extern int deemp_(real *x, integer *n, struct lpc10_decoder_state *st);
+extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau,
+                   integer *maxlag, real *amdf, integer *minptr, integer *maxptr);
+extern int dyptrk_(real *amdf, integer *ltau, integer *
+                   minptr, integer *voice, integer *pitch, integer *midx,
+                   struct lpc10_encoder_state *st);
+extern int encode_(integer *voice, integer *pitch, real *rms, real *rc,
+                   integer *ipitch, integer *irms, integer *irc);
+extern int energy_(integer *len, real *speech, real *rms);
+extern int ham84_(integer *input, integer *output, integer *errcnt);
+extern int hp100_(real *speech, integer *start, integer *end,
+		  struct lpc10_encoder_state *st);
+extern int inithp100_(void);
+extern int invert_(integer *order, real *phi, real *psi, real *rc);
+extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pass);
+extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real *ivrc);
+extern int lpcdec_(integer *bits, real *speech);
+extern int initlpcdec_(void);
+extern int lpcenc_(real *speech, integer *bits);
+extern int initlpcenc_(void);
+extern int lpfilt_(real *inbuf, real *lpbuf, integer *len, integer *nsamp);
+extern integer median_(integer *d1, integer *d2, integer *d3);
+extern int mload_(integer *order, integer *awins, integer *awinf, real *speech, real *phi, real *psi);
+extern int onset_(real *pebuf, integer *osbuf, integer *osptr, integer *oslen, integer *sbufl, integer *sbufh, integer *lframe, struct lpc10_encoder_state *st);
+extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, real *rc, integer *lframe, integer *ivuv, integer *ipiti, real *rmsi, real *rci, integer *nout, real *ratio, struct lpc10_decoder_state *st);
+extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *af, integer *vwin, integer *awin, integer *ewin, integer *lframe, integer *maxwin);
+extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obound, integer *vwin, integer *af, integer *lframe, integer *minwin, integer *maxwin, integer *dvwinl, integer *dvwinh);
+extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z__);
+extern int prepro_(real *speech, integer *length,
+		   struct lpc10_encoder_state *st);
+extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_decoder_state *st);
+extern integer random_(struct lpc10_decoder_state *st);
+extern int rcchk_(integer *order, real *rc1f, real *rc2f);
+extern int synths_(integer *voice, integer *pitch, real *rms, real *rc, real *speech, integer *k, struct lpc10_decoder_state *st);
+extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real *amdf, integer *minptr, integer *maxptr, integer *mintau);
+extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *minamd, real *maxamd, integer *mintau, real *ivrc, integer *obound, integer *voibuf, integer *af, struct lpc10_encoder_state *st);
+extern int vparms_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *dither, integer *mintau, integer *zc, integer *lbe, integer *fbe, real *qs, real *rc1, real *ar_b__, real *ar_f__);
+
+#endif
+
+
+#endif /* ! defined F2C_INCLUDE */
--- a/codecs/lpc10/ham84.c
+++ b/codecs/lpc10/ham84.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int ham84_(integer *input, integer *output, integer *errcnt);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -27,14 +26,21 @@ extern int ham84_(integer *input, integer *output, integer *errcnt);

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int ham84_(integer *input, integer *output, integer *errcnt);
+#endif
+
 /* ***************************************************************** */

 /* 	HAM84 Version 45G */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/hp100.c
+++ b/codecs/lpc10/hp100.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -24,12 +27,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int hp100_(real *speech, integer *start, integer *end,
-		  struct lpc10_encoder_state *st);
-extern int inithp100_(void);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -37,14 +34,23 @@ extern int inithp100_(void);

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int hp100_(real *speech, integer *start, integer *end,
+		  struct lpc10_encoder_state *st);
+extern int inithp100_(void);
+#endif
+
 /* ********************************************************************* */

 /*      HP100 Version 55 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/invert.c
+++ b/codecs/lpc10/invert.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int invert_(integer *order, real *phi, real *psi, real *rc);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -27,14 +26,21 @@ extern int invert_(integer *order, real *phi, real *psi, real *rc);

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int invert_(integer *order, real *phi, real *psi, real *rc);
+#endif
+
 /* **************************************************************** */

 /* 	INVERT Version 45G */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -97,9 +103,12 @@ extern int invert_(integer *order, real *phi, real *psi, real *rc);

 /*       Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/irc2pc.c
+++ b/codecs/lpc10/irc2pc.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pass);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -27,14 +26,21 @@ extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pas

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pass);
+#endif
+
 /* ***************************************************************** */

 /* 	IRC2PC Version 48 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -88,9 +94,12 @@ extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pas

 /* 	Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/ivfilt.c
+++ b/codecs/lpc10/ivfilt.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/19 01:20:22  markster
 Code cleanups (bug #66)

@@ -19,10 +22,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real *ivrc);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -30,14 +29,21 @@ extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real *ivrc);
+#endif
+
 /* ********************************************************************* */

 /* 	IVFILT Version 48 */

 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*
--- a/codecs/lpc10/lpcdec.c
+++ b/codecs/lpc10/lpcdec.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -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 lpcdec_(integer *bits, real *speech);
 extern int initlpcdec_(void);
@@ -38,13 +48,6 @@ extern int initlpcdec_(void);
 /*:ref: initsynths_ 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 {
@@ -61,9 +64,12 @@ static integer c__10 = 10;
 /* ***************************************************************** */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -119,9 +125,12 @@ static integer c__10 = 10;
    real rms;

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -156,9 +165,12 @@ static integer c__10 = 10;
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/lpcenc.c
+++ b/codecs/lpc10/lpcenc.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -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 lpcenc_(real *speech, integer *bits);
 extern int initlpcenc_(void);
@@ -38,13 +48,6 @@ extern int initlpcenc_(void);
 /*:ref: initanalys_ 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"
-
 /* Table of constant values */

 static integer c__180 = 180;
@@ -53,9 +56,12 @@ static integer c__10 = 10;
 /* ***************************************************************** */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -115,9 +121,12 @@ static integer c__10 = 10;

 /*       Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/lpfilt.c
+++ b/codecs/lpc10/lpfilt.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int lpfilt_(real *inbuf, real *lpbuf, integer *len, integer *nsamp);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -27,14 +26,21 @@ extern int lpfilt_(real *inbuf, real *lpbuf, integer *len, integer *nsamp);

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int lpfilt_(real *inbuf, real *lpbuf, integer *len, integer *nsamp);
+#endif
+
 /* *********************************************************************** */

 /* 	LPFILT Version 55 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/median.c
+++ b/codecs/lpc10/median.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern integer median_(integer *d1, integer *d2, integer *d3);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -27,14 +26,21 @@ extern integer median_(integer *d1, integer *d2, integer *d3);

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern integer median_(integer *d1, integer *d2, integer *d3);
+#endif
+
 /* ********************************************************************* */

 /* 	MEDIAN Version 45G */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/mload.c
+++ b/codecs/lpc10/mload.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int mload_(integer *order, integer *awins, integer *awinf, real *speech, real *phi, real *psi);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -27,14 +26,21 @@ extern int mload_(integer *order, integer *awins, integer *awinf, real *speech,

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int mload_(integer *order, integer *awins, integer *awinf, real *speech, real *phi, real *psi);
+#endif
+
 /* ***************************************************************** */

 /* 	MLOAD Version 48 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/onset.c
+++ b/codecs/lpc10/onset.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -24,10 +27,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int onset_(real *pebuf, integer *osbuf, integer *osptr, integer *oslen, integer *sbufl, integer *sbufh, integer *lframe, struct lpc10_encoder_state *st);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -35,6 +34,10 @@ extern int onset_(real *pebuf, integer *osbuf, integer *osptr, integer *oslen, i

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int onset_(real *pebuf, integer *osbuf, integer *osptr, integer *oslen, integer *sbufl, integer *sbufh, integer *lframe, struct lpc10_encoder_state *st);
+#endif
+
 /* Table of constant values */

 static real c_b2 = 1.f;
@@ -44,9 +47,12 @@ static real c_b2 = 1.f;
 /* 	ONSET Version 49 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -149,9 +155,12 @@ static real c_b2 = 1.f;

 /*       Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/pitsyn.c
+++ b/codecs/lpc10/pitsyn.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/11/23 22:14:32  markster
 Various warning cleanups

@@ -27,10 +30,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, real *rc, integer *lframe, integer *ivuv, integer *ipiti, real *rmsi, real *rci, integer *nout, real *ratio, struct lpc10_decoder_state *st);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -38,14 +37,21 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, real *rc, integer *lframe, integer *ivuv, integer *ipiti, real *rmsi, real *rci, integer *nout, real *ratio, struct lpc10_decoder_state *st);
+#endif
+
 /* ***************************************************************** */

 /* 	PITSYN Version 53 */

 /* $Log$
- * Revision 1.15  2003/11/23 22:14:32  markster
- * Various warning cleanups
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.15  2003/11/23 22:14:32  markster
+/* Various warning cleanups
+/*
 /* Revision 1.14  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -155,9 +161,12 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re

 /*       Arguments */
 /* $Log$
- * Revision 1.15  2003/11/23 22:14:32  markster
- * Various warning cleanups
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.15  2003/11/23 22:14:32  markster
+/* Various warning cleanups
+/*
 /* Revision 1.14  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/placea.c
+++ b/codecs/lpc10/placea.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/19 01:20:22  markster
 Code cleanups (bug #66)

@@ -22,10 +25,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *af, integer *vwin, integer *awin, integer *ewin, integer *lframe, integer *maxwin);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -33,14 +32,21 @@ extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *a

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *af, integer *vwin, integer *awin, integer *ewin, integer *lframe, integer *maxwin);
+#endif
+
 /* *********************************************************************** */

 /* 	PLACEA Version 48 */

 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*
--- a/codecs/lpc10/placev.c
+++ b/codecs/lpc10/placev.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -19,10 +22,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obound, integer *vwin, integer *af, integer *lframe, integer *minwin, integer *maxwin, integer *dvwinl, integer *dvwinh);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -30,14 +29,21 @@ extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obou

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obound, integer *vwin, integer *af, integer *lframe, integer *minwin, integer *maxwin, integer *dvwinl, integer *dvwinh);
+#endif
+
 /* ****************************************************************** */

 /* 	PLACEV Version 48 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/preemp.c
+++ b/codecs/lpc10/preemp.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z__);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -27,14 +26,21 @@ extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z__);
+#endif
+
 /* ******************************************************************* */

 /* 	PREEMP Version 55 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/prepro.c
+++ b/codecs/lpc10/prepro.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -21,15 +24,7 @@ Some OSS fixes and a few lpc changes to make it actually work
 * Revision 1.1  1996/08/19  22:30:54  jaf
 * Initial revision
 *
-
-*/
-
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int prepro_(real *speech, integer *length,
-		   struct lpc10_encoder_state *st)
-/*:ref: hp100_ 14 3 6 4 4 */
-/*:ref: inithp100_ 14 0 */
-#endif
+ */

 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
@@ -38,6 +33,13 @@ extern int prepro_(real *speech, integer *length,

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int prepro_(real *speech, integer *length,
+		   struct lpc10_encoder_state *st);
+/*:ref: hp100_ 14 3 6 4 4 */
+/*:ref: inithp100_ 14 0 */
+#endif
+
 /* Table of constant values */

 static integer c__1 = 1;
@@ -47,9 +49,12 @@ static integer c__1 = 1;
 /* 	PREPRO Version 48 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/random.c
+++ b/codecs/lpc10/random.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -24,10 +27,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern integer random_(struct lpc10_decoder_state *st);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -35,14 +34,21 @@ extern integer random_(struct lpc10_decoder_state *st);

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern integer random_(struct lpc10_decoder_state *st);
+#endif
+
 /* ********************************************************************** */

 /* 	RANDOM Version 49 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/rcchk.c
+++ b/codecs/lpc10/rcchk.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int rcchk_(integer *order, real *rc1f, real *rc2f);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -27,14 +26,21 @@ extern int rcchk_(integer *order, real *rc1f, real *rc2f);

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int rcchk_(integer *order, real *rc1f, real *rc2f);
+#endif
+
 /* ********************************************************************* */

 /* 	RCCHK Version 45G */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- 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)
 /*
--- a/codecs/lpc10/tbdm.c
+++ b/codecs/lpc10/tbdm.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -16,11 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real *amdf, integer *minptr, integer *maxptr, integer *mintau);
-/*:ref: difmag_ 14 8 6 4 4 4 4 6 4 4 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -28,14 +26,22 @@ extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real *amdf, integer *minptr, integer *maxptr, integer *mintau);
+/*:ref: difmag_ 14 8 6 4 4 4 4 6 4 4 */
+#endif
+
 /* ********************************************************************** */

 /* 	TBDM Version 49 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/voicin.c
+++ b/codecs/lpc10/voicin.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/11/23 22:14:32  markster
 Various warning cleanups

@@ -27,12 +30,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *minamd, real *maxamd, integer *mintau, real *ivrc, integer *obound, integer *voibuf, integer *af, struct lpc10_encoder_state *st);
-/* comlen contrl_ 12 */
-/*:ref: vparms_ 14 14 4 6 6 4 4 6 4 4 4 4 6 6 6 6 */
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -40,6 +37,12 @@ extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, int

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *minamd, real *maxamd, integer *mintau, real *ivrc, integer *obound, integer *voibuf, integer *af, struct lpc10_encoder_state *st);
+/* comlen contrl_ 12 */
+/*:ref: vparms_ 14 14 4 6 6 4 4 6 4 4 4 4 6 6 6 6 */
+#endif
+
 /* Common Block Declarations */

 extern struct {
@@ -54,9 +57,12 @@ extern struct {
 /* 	VOICIN Version 52 */

 /* $Log$
- * Revision 1.15  2003/11/23 22:14:32  markster
- * Various warning cleanups
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.15  2003/11/23 22:14:32  markster
+/* Various warning cleanups
+/*
 /* Revision 1.14  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -302,9 +308,12 @@ s*/
 /* 	Global Variables: */
 /*       Arguments */
 /* $Log$
- * Revision 1.15  2003/11/23 22:14:32  markster
- * Various warning cleanups
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.15  2003/11/23 22:14:32  markster
+/* Various warning cleanups
+/*
 /* Revision 1.14  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
--- a/codecs/lpc10/vparms.c
+++ b/codecs/lpc10/vparms.c
@@ -1,6 +1,9 @@
 /*

 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003

@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work

 */

-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int vparms_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *dither, integer *mintau, integer *zc, integer *lbe, integer *fbe, real *qs, real *rc1, real *ar_b__, real *ar_f__);
-#endif
-
 /*  -- translated by f2c (version 19951025).
   You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -27,6 +26,10 @@ extern int vparms_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, int

 #include "f2c.h"

+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int vparms_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *dither, integer *mintau, integer *zc, integer *lbe, integer *fbe, real *qs, real *rc1, real *ar_b__, real *ar_f__);
+#endif
+
 /* Table of constant values */

 static real c_b2 = 1.f;
@@ -36,9 +39,12 @@ static real c_b2 = 1.f;
 /* 	VPARMS Version 50 */

 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
 *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*