Fixes the system library Linux build

Resolves: audacity#5877
crsib · Jan 24, 2024 · 6f68e2b · 6f68e2b
1 parent 1581652
commit 6f68e2b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/libraries/lib-import-export/GetAcidizerTags.cpp b/libraries/lib-import-export/GetAcidizerTags.cpp
@@ -11,7 +11,6 @@
 #include "GetAcidizerTags.h"
 #include "AcidizerTags.h"
 
-#include "sndfile.h"
 #include <algorithm>
 #include <array>
 #include <cstring> // memset

diff --git a/libraries/lib-import-export/GetAcidizerTags.h b/libraries/lib-import-export/GetAcidizerTags.h
@@ -14,7 +14,9 @@
 #include <string>
 #include <vector>
 
-typedef struct SNDFILE_tag SNDFILE;
+// SNDFILE is defined differently between libsndfile versions
+// making forward declarations impossible.
+#include <sndfile.h>
 
 namespace LibFileFormats
 {

diff --git a/libraries/lib-import-export/LibsndfileTagger.cpp b/libraries/lib-import-export/LibsndfileTagger.cpp
@@ -1,7 +1,6 @@
 #include "LibsndfileTagger.h"
 #include "AcidizerTags.h"
 
-#include "sndfile.h"
 #include <array>
 #include <cassert>
 #include <cmath>

diff --git a/libraries/lib-import-export/LibsndfileTagger.h b/libraries/lib-import-export/LibsndfileTagger.h
@@ -12,11 +12,13 @@
 
 #include "AcidizerTags.h"
 
+// SNDFILE is defined differently between libsndfile versions
+// making forward declarations impossible.
+#include <sndfile.h>
+
 #include <memory>
 #include <string>
 
-typedef struct SNDFILE_tag SNDFILE;
-
 namespace LibImportExport
 {
 namespace Test