---

 src/fixio.c      |    9 +++++----

 utils/mkbshift.c |   18 +++++++++---------

 2 files changed, 14 insertions(+), 13 deletions(-)

​

--- a/src/fixio.c

+++ b/src/fixio.c

@@ -10,16 +10,17 @@

  * $Id: fixio.c,v 1.4 2002/01/28 01:16:52 jason Exp $

  */

+#ifdef HAVE_CONFIG_H

+#include "config.h"

+#endif

+#define _XOPEN_SOURCE

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

+#include <unistd.h>

 #include "shorten.h"

 #include "bitshift.h"

-#ifdef HAVE_CONFIG_H

-#include "config.h"

-#endif

-

 extern int WriteWaveFile;

 #define CAPMAXSCHAR(x)  ((x > 127) ? 127 : x)

--- a/utils/mkbshift.c

+++ b/utils/mkbshift.c

@@ -46,7 +46,7 @@

       tab[Slinear2ulaw(sample)] = shift;

   /* print this out as a lookup table */

-  fprintf(fout, "char ulaw_maxshift[%d] = {", USIZE);

+  fprintf(fout, "signed int ulaw_maxshift[%d] = {", USIZE);

   for(i = 0; i < USIZE - 1; i++)

     fprintf(fout, "%d,", tab[i]);

   fprintf(fout, "%d};\n\n", tab[USIZE - 1]);

@@ -79,28 +79,28 @@

        error_exit("identity maping failed for shift: %d\tindex: %d\n",shift,i);

   /* print out the ulaw_inward lookup table */

-  fprintf(fout, "schar ulaw_inward[%d][%d] = {\n", SHIFTSIZE, USIZE);

+  fprintf(fout, "signed int ulaw_inward[%d][%d] = {\n", SHIFTSIZE, USIZE);

   for(shift = 0; shift < SHIFTSIZE; shift++) {

     fprintf(fout, "{");

     for(i = 0; i < USIZE - 1; i++)

-      fprintf(fout, "%ld,", forwardmap[shift][i]);

+      fprintf(fout, "%d,", forwardmap[shift][i]);

     if(shift != SHIFTSIZE - 1)

-      fprintf(fout, "%ld},\n", forwardmap[shift][USIZE - 1]);

+      fprintf(fout, "%d},\n", forwardmap[shift][USIZE - 1]);

     else

-      fprintf(fout, "%ld}\n};\n", forwardmap[shift][USIZE - 1]);

+      fprintf(fout, "%d}\n};\n", forwardmap[shift][USIZE - 1]);

   }

   fprintf(fout, "\n");

   /* print out the ulaw_outward lookup table */

-  fprintf(fout, "uchar ulaw_outward[%d][%d] = {\n", SHIFTSIZE, USIZE);

+  fprintf(fout, "signed int ulaw_outward[%d][%d] = {\n", SHIFTSIZE, USIZE);

   for(shift = 0; shift < SHIFTSIZE; shift++) {

     fprintf(fout, "{");

     for(i = 0; i < USIZE - 1; i++)

-      fprintf(fout, "%ld,", reversemap[shift][i]);

+      fprintf(fout, "%d,", reversemap[shift][i]);

     if(shift != SHIFTSIZE - 1)

-      fprintf(fout, "%ld},\n", reversemap[shift][USIZE - 1]);

+      fprintf(fout, "%d},\n", reversemap[shift][USIZE - 1]);

     else

-      fprintf(fout, "%ld}\n};\n", reversemap[shift][USIZE - 1]);

+      fprintf(fout, "%d}\n};\n", reversemap[shift][USIZE - 1]);

   }

   fclose(fout);

​