Don't use symbol names read/write.

Fixes incompatible redefinition error on mingw.

Chris Bagwell committed 14 years ago

Commit 388af591 parent 943cae72 files · +7 −7Browse files

Unified · Split

2 files

@@ -68,7 +68,7 @@ static void decode(priv_t * p, int bit) · 67 unmodified lines
68	68	p->sample = max(p->step_mult * p->sample - p->step, SOX_SAMPLE_MIN);
69	69	}
70	70
71		−static size_t read(sox_format_t * ft, sox_sample_t * buf, size_t len)
	71	+static size_t cvsdread(sox_format_t * ft, sox_sample_t * buf, size_t len)
72	72	{
73	73	priv_t p = (priv_t ) ft->priv;
74	74	size_t i;
@@ -85,7 +85,7 @@ static size_t read(sox_format_t * ft, sox_sample_t * buf, size_t len) · 10 unmodified lines
85	85	return i;
86	86	}
87	87
88		−static size_t write(sox_format_t * ft, sox_sample_t const * buf, size_t len)
	88	+static size_t cvsdwrite(sox_format_t * ft, sox_sample_t const * buf, size_t len)
89	89	{
90	90	priv_t p = (priv_t ) ft->priv;
91	91	size_t i;
@@ -107,7 +107,7 @@ LSX_FORMAT_HANDLER(cvu) · 15 unmodified lines
107	107	static unsigned const write_encodings[] = {SOX_ENCODING_CVSD, 1, 0, 0};
108	108	static sox_format_handler_t const handler = {SOX_LIB_VERSION_CODE,
109	109	"Headerless Continuously Variable Slope Delta modulation (unfiltered)",
110		− names, SOX_FILE_MONO, start, read, NULL, start, write, NULL,
	110	+ names, SOX_FILE_MONO, start, cvsdread, NULL, start, cvsdwrite, NULL,
111	111	lsx_rawseek, write_encodings, NULL, sizeof(priv_t)
112	112	};
113	113	return &handler;

@@ -327,7 +327,7 @@ static int start(sox_format_t* ft) · 326 unmodified lines
327	327	return SOX_SUCCESS;
328	328	}
329	329
330		−static size_t read(sox_format_t * ft, sox_sample_t* buf, size_t len)
	330	+static size_t waveread(sox_format_t * ft, sox_sample_t* buf, size_t len)
331	331	{
332	332	size_t copied = 0;
333	333	priv_t priv = (priv_t)ft->priv;
@@ -394,7 +394,7 @@ static size_t read(sox_format_t * ft, sox_sample_t* buf, size_t len) · 60 unmodified lines
394	394	return copied;
395	395	}
396	396
397		−static size_t write(sox_format_t * ft, const sox_sample_t* buf, size_t len)
	397	+static size_t wavewrite(sox_format_t * ft, const sox_sample_t* buf, size_t len)
398	398	{
399	399	unsigned clips = 0;
400	400	size_t copied = 0;
@@ -475,8 +475,8 @@ LSX_FORMAT_HANDLER(waveaudio) · 74 unmodified lines
475	475	static sox_format_handler_t const handler = {SOX_LIB_VERSION_CODE,
476	476	"Windows Multimedia Audio", names,
477	477	SOX_FILE_DEVICE \| SOX_FILE_NOSTDIO,
478		− start, read, stop,
479		− start, write, stop,
	478	+ start, waveread, stop,
	479	+ start, wavewrite, stop,
480	480	NULL, write_encodings, NULL, sizeof(priv_t)
481	481	};
482	482	return &handler;

Keyboard shortcuts