sndfile: drop unnecessary HAVE_SNDFILE tests

These files are only compiled if HAVE_SNDFILE is defined. There is no need to test it again within each file.

Mans Rullgard committed 6 years ago

Commit 632942f1 parent b50a5fa10 files · +0 −40Browse files

Unified · Split

10 files

src/caf.c +0 −4
src/fap.c +0 −4
src/mat4.c +0 −4
src/mat5.c +0 −4
src/paf.c +0 −4
src/pvf.c +0 −4
src/sd2.c +0 −4
src/sndfile.c +0 −4
src/w64.c +0 −4
src/xi.c +0 −4

src/caf.c+0−4

@@ -17,8 +17,6 @@ · 16 unmodified lines
17	17
18	18	#include "sox_i.h"
19	19
20		−#if defined HAVE_SNDFILE
21		−
22	20	LSX_FORMAT_HANDLER(caf)
23	21	{
24	22	static char const * const names[] = {"caf", NULL};
@@ -35,5 +33,3 @@ LSX_FORMAT_HANDLER(caf) · 10 unmodified lines
35	33	handler.write_formats = write_encodings;
36	34	return &handler;
37	35	}
38		−
39		−#endif

src/fap.c+0−4

@@ -17,8 +17,6 @@ · 16 unmodified lines
17	17
18	18	#include "sox_i.h"
19	19
20		−#if defined HAVE_SNDFILE
21		−
22	20	LSX_FORMAT_HANDLER(fap)
23	21	{
24	22	static char const * const names[] = {"fap", NULL};
@@ -31,5 +29,3 @@ LSX_FORMAT_HANDLER(fap) · 6 unmodified lines
31	29	handler.write_formats = write_encodings;
32	30	return &handler;
33	31	}
34		−
35		−#endif

src/mat4.c+0−4

@@ -17,8 +17,6 @@ · 16 unmodified lines
17	17
18	18	#include "sox_i.h"
19	19
20		−#if defined HAVE_SNDFILE
21		−
22	20	LSX_FORMAT_HANDLER(mat4)
23	21	{
24	22	static char const * const names[] = {"mat4", "mat", NULL};
@@ -33,5 +31,3 @@ LSX_FORMAT_HANDLER(mat4) · 8 unmodified lines
33	31	handler.write_formats = write_encodings;
34	32	return &handler;
35	33	}
36		−
37		−#endif

src/mat5.c+0−4

@@ -17,8 +17,6 @@ · 16 unmodified lines
17	17
18	18	#include "sox_i.h"
19	19
20		−#if defined HAVE_SNDFILE
21		−
22	20	LSX_FORMAT_HANDLER(mat5)
23	21	{
24	22	static char const * const names[] = {"mat5", NULL};
@@ -33,5 +31,3 @@ LSX_FORMAT_HANDLER(mat5) · 8 unmodified lines
33	31	handler.write_formats = write_encodings;
34	32	return &handler;
35	33	}
36		−
37		−#endif

src/paf.c+0−4

@@ -17,8 +17,6 @@ · 16 unmodified lines
17	17
18	18	#include "sox_i.h"
19	19
20		−#if defined HAVE_SNDFILE
21		−
22	20	LSX_FORMAT_HANDLER(paf)
23	21	{
24	22	static char const * const names[] = {"paf", NULL};
@@ -31,5 +29,3 @@ LSX_FORMAT_HANDLER(paf) · 6 unmodified lines
31	29	handler.write_formats = write_encodings;
32	30	return &handler;
33	31	}
34		−
35		−#endif

src/pvf.c+0−4

@@ -17,8 +17,6 @@ · 16 unmodified lines
17	17
18	18	#include "sox_i.h"
19	19
20		−#if defined HAVE_SNDFILE
21		−
22	20	LSX_FORMAT_HANDLER(pvf)
23	21	{
24	22	static char const * const names[] = {"pvf", NULL};
@@ -30,5 +28,3 @@ LSX_FORMAT_HANDLER(pvf) · 5 unmodified lines
30	28	handler.write_formats = write_encodings;
31	29	return &handler;
32	30	}
33		−
34		−#endif

src/sd2.c+0−4

@@ -17,8 +17,6 @@ · 16 unmodified lines
17	17
18	18	#include "sox_i.h"
19	19
20		−#if defined HAVE_SNDFILE
21		−
22	20	LSX_FORMAT_HANDLER(sd2)
23	21	{
24	22	static char const * const names[] = {"sd2", NULL};
@@ -30,5 +28,3 @@ LSX_FORMAT_HANDLER(sd2) · 5 unmodified lines
30	28	handler.write_formats = write_encodings;
31	29	return &handler;
32	30	}
33		−
34		−#endif

src/sndfile.c+0−4

@@ -20,8 +20,6 @@ · 19 unmodified lines
20	20
21	21	#include "sox_i.h"
22	22
23		−#ifdef HAVE_SNDFILE
24		−
25	23	#include <assert.h>
26	24	#include <stdio.h>
27	25	#include <string.h>
@@ -536,5 +534,3 @@ LSX_FORMAT_HANDLER(sndfile) · 508 unmodified lines
536	534
537	535	return &format;
538	536	}
539		−
540		−#endif

src/w64.c+0−4

@@ -17,8 +17,6 @@ · 16 unmodified lines
17	17
18	18	#include "sox_i.h"
19	19
20		−#if defined HAVE_SNDFILE
21		−
22	20	LSX_FORMAT_HANDLER(w64)
23	21	{
24	22	static char const * const names[] = {"w64", NULL};
@@ -39,5 +37,3 @@ LSX_FORMAT_HANDLER(w64) · 14 unmodified lines
39	37	handler.write_formats = write_encodings;
40	38	return &handler;
41	39	}
42		−
43		−#endif

@@ -17,8 +17,6 @@ · 16 unmodified lines
17	17
18	18	#include "sox_i.h"
19	19
20		−#if defined HAVE_SNDFILE
21		−
22	20	LSX_FORMAT_HANDLER(xi)
23	21	{
24	22	static char const * const names[] = {"xi", NULL};
@@ -30,5 +28,3 @@ LSX_FORMAT_HANDLER(xi) · 5 unmodified lines
30	28	handler.write_formats = write_encodings;
31	29	return &handler;
32	30	}
33		−
34		−#endif