shithub: sox

Download patch

ref: 0959b3fbc4cf430d713b8c418f4ab518fe89950a
parent: 179edfda1f77023a6c99c9f32ee541299ab3e0a3
author: Mans Rullgard <mans@mansr.com>
date: Wed Aug 12 19:17:03 EDT 2020

remove pointless #undef DL_FOO

The DL_FOO symbols are only defined if libltdl is available.

--- a/src/amr-nb.c
+++ b/src/amr-nb.c
@@ -48,10 +48,6 @@
 #define AMR_RATE            8000
 #define AMR_DESC            "3GPP Adaptive Multi Rate Narrow-Band (AMR-NB) lossy speech compressor"
 
-#if !defined(HAVE_LIBLTDL)
-  #undef DL_AMRNB
-#endif
-
 #ifdef DL_AMRNB
   #define AMR_FUNC  LSX_DLENTRY_DYNAMIC
 #else
--- a/src/amr-wb.c
+++ b/src/amr-wb.c
@@ -46,10 +46,6 @@
 #define AMR_RATE            16000
 #define AMR_DESC            "3GPP Adaptive Multi Rate Wide-Band (AMR-WB) lossy speech compressor"
 
-#if !defined(HAVE_LIBLTDL)
-  #undef DL_AMRWB
-#endif
-
 #ifdef DL_AMRWB
   #define AMR_FUNC  LSX_DLENTRY_DYNAMIC
 #else
--- a/src/mp3.c
+++ b/src/mp3.c
@@ -58,11 +58,6 @@
   #include <twolame.h>
 #endif
 
-#ifndef HAVE_LIBLTDL
-  #undef DL_LAME
-  #undef DL_MAD
-#endif
-
 /* Under Windows, importing data from DLLs is a dicey proposition. This is true
  * when using dlopen, but also true if linking directly against the DLL if the
  * header does not mark the data as __declspec(dllexport), which mad.h does not.
--- a/src/sndfile.c
+++ b/src/sndfile.c
@@ -28,10 +28,6 @@
 
 #define LOG_MAX 2048 /* As per the SFC_GET_LOG_INFO example */
 
-#if !defined(HAVE_LIBLTDL)
-#undef DL_SNDFILE
-#endif
-
 static const char* const sndfile_library_names[] =
 {
 #ifdef DL_SNDFILE