shithub: sox

Download patch

ref: 1a75b233f66ec0d19a99acb7f293f9b3332ff9c5
parent: 9515edc95ac6b0449ebd5e191968380d08f7e596
author: cbagwell <cbagwell>
date: Mon Oct 23 19:45:07 EDT 2000

Added small patch to allow compiling under cygwin 95.2

--- a/Changelog
+++ b/Changelog
@@ -4,7 +4,7 @@
 This file contains a list of all changes starting after the release of
 sox-11gamma.
 
-sox-12.18
+sox-12.17.1
 ---------
   o Andreas Kies fixed a bug were we were not detecting correctly
     if an output file was seekable.
@@ -16,6 +16,8 @@
   o Fixed bug were it was impossible to output ADPCM data in wav files.
   o Fixed bug were rate had to be specified for sphere files (fix from
     Antti Honkela).
+  o Added small work around to let compile with cygwin's gcc 95.2
+    which also now allows to compile with GSM support under windows.
 
 sox-12.17
 ---------
--- a/README
+++ b/README
@@ -74,7 +74,7 @@
 
 History:
 
-This is the 12th release, Patchlevel 17 of the Sound Tools.
+This is release 12.17, Patchlevel 1 of the Sound Tools.
 SoX was originally written and maintained by Lance Norskog but
 unfortunetly he has stopped maintaining it since 1995.  I, Chris
 Bagwell (cbagwell@sprynet.com), have started maintaining it since
--- a/patchlvl.h
+++ /dev/null
@@ -1,1 +1,0 @@
-#define	PATCHLEVEL	17
--- a/src/misc.c
+++ b/src/misc.c
@@ -12,8 +12,6 @@
  */
 
 #include "st.h"
-#include "version.h"
-#include "patchlvl.h"
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -444,7 +442,7 @@
 {
 	static char versionstr[20];
 	
-	sprintf(versionstr, "Version %d.%d", VERSION, PATCHLEVEL);
+	sprintf(versionstr, "Version %s", ST_LIB_VERSION);
 	return(versionstr);
 }
 
--- a/src/sox.c
+++ b/src/sox.c
@@ -27,8 +27,6 @@
  */ 
 
 #include "st.h"
-#include "version.h"
-#include "patchlvl.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>		/* for malloc() */
--- a/src/st.h
+++ b/src/st.h
@@ -24,6 +24,10 @@
 #include <byteswap.h>
 #endif
 
+/* Warning.  The format of this version string could change in the
+ * future to allow better parsing.
+ */
+#define ST_LIB_VERSION "12.17.1"
 
 /* SJB: these may be changed to assist fail-recovery in libST */
 #define st_malloc malloc
--- a/src/util.c
+++ b/src/util.c
@@ -87,11 +87,11 @@
  * go over the array limit ourself!
  */
 void
-st_fail_errno(ft_t ft, int errno, const char *fmt, ...)
+st_fail_errno(ft_t ft, int st_errno, const char *fmt, ...)
 {
 	va_list args;
 
-	ft->st_errno = errno;
+	ft->st_errno = st_errno;
 
 	va_start(args, fmt);
 	vsprintf(ft->st_errstr, fmt, args);
--- a/version.h
+++ /dev/null
@@ -1,1 +1,0 @@
-#define VERSION 12