[Asterisk-cvs] asterisk/codecs/lpc10 analys.c,1.15,1.16 bsynz.c,1.14,1.15 chanwr.c,1.14,1.15 dcbias.c,1.14,1.15 decode.c,1.15,1.16 deemp.c,1.14,1.15 difmag.c,1.14,1.15 dyptrk.c,1.14,1.15 encode.c,1.14,1.15 energy.c,1.14,1.15 f2c.h,1.14,1.15 ham84.c,1.14,1.15 hp100.c,1.14,1.15 invert.c,1.14,1.15 irc2pc.c,1.14,1.15 ivfilt.c,1.15,1.16 lpcdec.c,1.14,1.15 lpcenc.c,1.14,1.15 lpfilt.c,1.14,1.15 median.c,1.14,1.15 mload.c,1.14,1.15 onset.c,1.14,1.15 pitsyn.c,1.15,1.16 placea.c,1.15,1.16 placev.c,1.14,1.15 preemp.c,1.14,1.15 prepro.c,1.14,1.15 random.c,1.14,1.15 rcchk.c,1.14,1.15 synths.c,1.15,1.16 tbdm.c,1.14,1.15 voicin.c,1.15,1.16 vparms.c,1.14,1.15

markster at lists.digium.com markster at lists.digium.com
Sat Jun 26 00:04:23 CDT 2004 

Update of /usr/cvsroot/asterisk/codecs/lpc10
In directory mongoose.digium.com:/tmp/cvs-serv14568/codecs/lpc10

Modified Files:
	analys.c bsynz.c chanwr.c dcbias.c decode.c deemp.c difmag.c 
	dyptrk.c encode.c energy.c f2c.h ham84.c hp100.c invert.c 
	irc2pc.c ivfilt.c lpcdec.c lpcenc.c lpfilt.c median.c mload.c 
	onset.c pitsyn.c placea.c placev.c preemp.c prepro.c random.c 
	rcchk.c synths.c tbdm.c voicin.c vparms.c 
Log Message:
Merge source cleanups (bug #1911)


Index: analys.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/analys.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- analys.c	19 Sep 2003 01:20:22 -0000	1.15
+++ analys.c	26 Jun 2004 03:50:14 -0000	1.16
@@ -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 @@
 
 */
 
+#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 @@
 	-lf2c -lm   (in that order)
 */
 
-#include "f2c.h"
-
 /* Common Block Declarations */
 
 extern struct {
@@ -85,6 +88,9 @@
 /* 	ANALYS Version 55 */
 
 /* $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)
 /*
@@ -234,13 +240,7 @@
     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,6 +260,9 @@
     real phi[100]	/* was [10][10] */, psi[10];
 
 /* $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)
 /*
@@ -297,6 +300,9 @@
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments to ANALYS */
 /* $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)
 /*

Index: bsynz.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/bsynz.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- bsynz.c	12 Feb 2003 13:59:14 -0000	1.14
+++ bsynz.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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 @@
 
 #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,6 +54,9 @@
 /* 	BSYNZ Version 54 */
 
 /* $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
 /*
@@ -150,6 +156,9 @@
     real lpi0, hpi0;
 
 /* $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
 /*
@@ -184,6 +193,9 @@
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
 /* $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
 /*

Index: chanwr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/chanwr.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- chanwr.c	12 Feb 2003 13:59:14 -0000	1.14
+++ chanwr.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,6 +36,9 @@
 /* 	CHANL Version 49 */
 
 /* $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
 /*

Index: dcbias.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/dcbias.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dcbias.c	12 Feb 2003 13:59:14 -0000	1.14
+++ dcbias.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +26,18 @@
 
 #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.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
 /*

Index: decode.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/decode.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- decode.c	19 Sep 2003 01:20:22 -0000	1.15
+++ decode.c	26 Jun 2004 03:50:14 -0000	1.16
@@ -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 @@
 
 */
 
-#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 @@
 
 #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,6 +62,9 @@
 /* 	DECODE Version 54 */
 
 /* $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)
 /*
@@ -200,6 +206,9 @@
     integer ishift, errcnt, lsb;
 
 /* $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)
 /*
@@ -237,6 +246,9 @@
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
 /* $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)
 /*

Index: deemp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/deemp.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- deemp.c	12 Feb 2003 13:59:14 -0000	1.14
+++ deemp.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +34,18 @@
 
 #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.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
 /*

Index: difmag.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/difmag.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- difmag.c	12 Feb 2003 13:59:14 -0000	1.14
+++ difmag.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +26,18 @@
 
 #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.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
 /*

Index: dyptrk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/dyptrk.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dyptrk.c	12 Feb 2003 13:59:15 -0000	1.14
+++ dyptrk.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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 @@
 
 #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,6 +53,9 @@
 /* 	DYPTRK Version 52 */
 
 /* $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
 /*
@@ -142,6 +148,9 @@
 
 /*       Arguments */
 /* $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
 /*

Index: encode.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/encode.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- encode.c	12 Feb 2003 13:59:15 -0000	1.14
+++ encode.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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 @@
 
 #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,6 +49,9 @@
 /* 	ENCODE Version 54 */
 
 /* $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
 /*
@@ -134,6 +140,9 @@
     integer idel, nbit, i__, j, i2, i3, mrk;
 
 /* $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
 /*
@@ -160,6 +169,9 @@
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
 /* $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
 /*

Index: energy.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/energy.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- energy.c	12 Feb 2003 13:59:15 -0000	1.14
+++ energy.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +26,18 @@
 
 #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.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
 /*

Index: f2c.h
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/f2c.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- f2c.h	12 Feb 2003 13:59:15 -0000	1.14
+++ f2c.h	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 /* 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 @@
 #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 */

Index: ham84.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/ham84.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ham84.c	12 Feb 2003 13:59:15 -0000	1.14
+++ ham84.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +26,18 @@
 
 #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.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
 /*

Index: hp100.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/hp100.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- hp100.c	12 Feb 2003 13:59:15 -0000	1.14
+++ hp100.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +34,20 @@
 
 #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.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
 /*

Index: invert.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/invert.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- invert.c	12 Feb 2003 13:59:15 -0000	1.14
+++ invert.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +26,18 @@
 
 #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.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
 /*
@@ -97,6 +103,9 @@
 
 /*       Arguments */
 /* $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
 /*

Index: irc2pc.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/irc2pc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- irc2pc.c	12 Feb 2003 13:59:15 -0000	1.14
+++ irc2pc.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +26,18 @@
 
 #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.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
 /*
@@ -88,6 +94,9 @@
 
 /* 	Arguments */
 /* $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
 /*

Index: ivfilt.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/ivfilt.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ivfilt.c	19 Sep 2003 01:20:22 -0000	1.15
+++ ivfilt.c	26 Jun 2004 03:50:14 -0000	1.16
@@ -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 @@
 
 */
 
-#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,11 +29,18 @@
 
 #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.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)
 /*

Index: lpcdec.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/lpcdec.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- lpcdec.c	12 Feb 2003 13:59:15 -0000	1.14
+++ lpcdec.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
+/*  -- 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 @@
 /*: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,6 +64,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
 /*
@@ -119,6 +125,9 @@
     real rms;
 
 /* $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
 /*
@@ -156,6 +165,9 @@
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
 /* $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
 /*

Index: lpcenc.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/lpcenc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- lpcenc.c	12 Feb 2003 13:59:15 -0000	1.14
+++ lpcenc.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
+/*  -- 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 @@
 /*: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,6 +56,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
 /*
@@ -115,6 +121,9 @@
 
 /*       Arguments */
 /* $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
 /*

Index: lpfilt.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/lpfilt.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- lpfilt.c	12 Feb 2003 13:59:15 -0000	1.14
+++ lpfilt.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +26,18 @@
 
 #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.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
 /*

Index: median.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/median.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- median.c	12 Feb 2003 13:59:15 -0000	1.14
+++ median.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +26,18 @@
 
 #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.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
 /*

Index: mload.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/mload.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mload.c	12 Feb 2003 13:59:15 -0000	1.14
+++ mload.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +26,18 @@
 
 #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.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
 /*

Index: onset.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/onset.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- onset.c	12 Feb 2003 13:59:15 -0000	1.14
+++ onset.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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 @@
 
 #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,6 +47,9 @@
 /* 	ONSET Version 49 */
 
 /* $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
 /*
@@ -149,6 +155,9 @@
 
 /*       Arguments */
 /* $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
 /*

Index: pitsyn.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/pitsyn.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- pitsyn.c	23 Nov 2003 22:14:32 -0000	1.15
+++ pitsyn.c	26 Jun 2004 03:50:14 -0000	1.16
@@ -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 @@
 
 */
 
-#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,11 +37,18 @@
 
 #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.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
 /*
@@ -155,6 +161,9 @@
 
 /*       Arguments */
 /* $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
 /*

Index: placea.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/placea.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- placea.c	19 Sep 2003 01:20:22 -0000	1.15
+++ placea.c	26 Jun 2004 03:50:14 -0000	1.16
@@ -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 @@
 
 */
 
-#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,11 +32,18 @@
 
 #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.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)
 /*

Index: placev.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/placev.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- placev.c	12 Feb 2003 13:59:15 -0000	1.14
+++ placev.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +29,18 @@
 
 #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.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
 /*

Index: preemp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/preemp.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- preemp.c	12 Feb 2003 13:59:15 -0000	1.14
+++ preemp.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +26,18 @@
 
 #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.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
 /*

Index: prepro.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/prepro.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- prepro.c	12 Feb 2003 13:59:15 -0000	1.14
+++ prepro.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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,23 +24,22 @@
  * Revision 1.1  1996/08/19  22:30:54  jaf
  * Initial revision
  *
+ */
 
+/*  -- 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 prepro_(real *speech, integer *length,
-		   struct lpc10_encoder_state *st)
+		   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:
-	-lf2c -lm   (in that order)
-*/
-
-#include "f2c.h"
-
 /* Table of constant values */
 
 static integer c__1 = 1;
@@ -47,6 +49,9 @@
 /* 	PREPRO Version 48 */
 
 /* $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
 /*

Index: random.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/random.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- random.c	12 Feb 2003 13:59:15 -0000	1.14
+++ random.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +34,18 @@
 
 #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.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
 /*

Index: rcchk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/rcchk.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- rcchk.c	12 Feb 2003 13:59:15 -0000	1.14
+++ rcchk.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +26,18 @@
 
 #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.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
 /*

Index: synths.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/synths.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- synths.c	27 Sep 2003 02:45:37 -0000	1.15
+++ synths.c	26 Jun 2004 03:50:14 -0000	1.16
@@ -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 @@
 
 */
 
+/*  -- 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 @@
 /*: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,6 +67,9 @@
 /* 	SYNTHS Version 54 */
 
 /* $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)
 /*
@@ -179,9 +185,6 @@
     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,6 +193,9 @@
     real rci[160]	/* was [10][16] */;
 
 /* $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)
 /*
@@ -227,6 +233,9 @@
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
 /* $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)
 /*

Index: tbdm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/tbdm.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- tbdm.c	12 Feb 2003 13:59:15 -0000	1.14
+++ tbdm.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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,11 +26,19 @@
 
 #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.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
 /*

Index: voicin.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/voicin.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- voicin.c	23 Nov 2003 22:14:32 -0000	1.15
+++ voicin.c	26 Jun 2004 03:50:14 -0000	1.16
@@ -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 @@
 
 */
 
-#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 @@
 
 #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,6 +57,9 @@
 /* 	VOICIN Version 52 */
 
 /* $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
 /*
@@ -302,6 +308,9 @@
 /* 	Global Variables: */
 /*       Arguments */
 /* $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
 /*

Index: vparms.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/vparms.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- vparms.c	12 Feb 2003 13:59:15 -0000	1.14
+++ vparms.c	26 Jun 2004 03:50:14 -0000	1.15
@@ -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 @@
 
 */
 
-#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 @@
 
 #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,6 +39,9 @@
 /* 	VPARMS Version 50 */
 
 /* $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
 /*

More information about the svn-commits mailing list