diff --git a/include/audacity/Types.h b/include/audacity/Types.h index e21551458..4b95a94cb 100644 --- a/include/audacity/Types.h +++ b/include/audacity/Types.h @@ -823,13 +823,6 @@ using EffectFamilySymbol = ComponentInterfaceSymbol; #endif #endif //_MSC_VER - #ifdef __GNUC__ - #ifndef __CONFIG_UNIX_INCLUDED - #define __CONFIG_UNIX_INCLUDED - #include "configunix.h" - #endif - #endif - /* The GCC-elf implementation */ #ifdef HAVE_VISIBILITY // this is provided by the configure script, is only // enabled for suitable GCC versions diff --git a/lib-src/libmad/configmac.h b/lib-src/libmad/configmac.h deleted file mode 100644 index ecd3b6c9e..000000000 --- a/lib-src/libmad/configmac.h +++ /dev/null @@ -1,100 +0,0 @@ -/* - * mad - MPEG audio decoder - * Copyright (C) 2000-2001 Robert Leslie - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: configmac.h,v 1.1 2002-04-16 04:25:39 dmazzoni Exp $ - */ - -# ifndef LIBMAD_CONFIG_H -# define LIBMAD_CONFIG_H - -/***************************************************************************** - * Definitions selected automatically by `configure' * - *****************************************************************************/ - -/* Define to empty if the keyword does not work. */ -#undef const - -/* Define if you have that is POSIX.1 compatible. */ -#undef HAVE_SYS_WAIT_H - -/* Define as __inline if that's what the C compiler calls it. */ -#define inline __inline - -/* Define to `int' if doesn't define. */ -#undef pid_t - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS - -/* Define to optimize for speed over accuracy. */ -#undef OPT_SPEED - -/* Define to optimize for accuracy over speed. */ -#define OPT_ACCURACY - -/* Define to enable a fast subband synthesis approximation optimization. */ -#undef OPT_SSO - -/* Define to influence a strict interpretation of the ISO/IEC standards, - even if this is in opposition with best accepted practices. */ -#undef OPT_STRICT - -/* Define if your MIPS CPU supports a 2-operand MADD instruction. */ -#undef HAVE_MADD_ASM - -/* Define if your MIPS CPU supports a 2-operand MADD16 instruction. */ -#undef HAVE_MADD16_ASM - -/* Define to enable diagnostic debugging support. */ -#undef DEBUG - -/* Define to disable debugging assertions. */ -#undef NDEBUG - -/* Define to enable experimental code. */ -#undef EXPERIMENTAL - -/* The number of bytes in a int. */ -#define SIZEOF_INT 4 - -/* The number of bytes in a long. */ -#define SIZEOF_LONG 4 - -/* The number of bytes in a long long. */ -#undef SIZEOF_LONG_LONG - -/* Define if you have the header file. */ -#undef HAVE_LIMITS_H - -/* Define if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Name of package */ -#define PACKAGE "libmad" - -/* Version number of package */ -#define VERSION "0.14.2b" - -/* #define FPM_DEFAULT 1 */ -#define FPM_DEFAULT 1 - -/***************************************************************************** - * End of automatically configured definitions * - *****************************************************************************/ - -# endif diff --git a/lib-src/libmad/configunix.h b/lib-src/libmad/configunix.h deleted file mode 100644 index 6df00faf2..000000000 --- a/lib-src/libmad/configunix.h +++ /dev/null @@ -1,160 +0,0 @@ -/* configunix.h. Generated automatically by configure. */ -/* configunix.h.in. Generated from configure.in by autoheader. */ -/* - * libmad - MPEG audio decoder library - * Copyright (C) 2000-2001 Robert Leslie - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: configunix.h,v 1.1 2005-09-12 07:01:29 dmazzoni Exp $ - */ - -# ifndef LIBMAD_CONFIG_H -# define LIBMAD_CONFIG_H - -/***************************************************************************** - * Definitions selected automatically by `configure' * - *****************************************************************************/ - -/* Define to optimize for speed over accuracy. */ -/* #undef OPT_SPEED */ - -/* Define to optimize for accuracy over speed. */ -/* #undef OPT_ACCURACY */ - -/* Define to enable a fast subband synthesis approximation optimization. */ -/* #undef OPT_SSO */ - -/* Define to influence a strict interpretation of the ISO/IEC standards, - even if this is in opposition with best accepted practices. */ -/* #undef OPT_STRICT */ - -/* Define if your MIPS CPU supports a 2-operand MADD instruction. */ -/* #undef HAVE_MADD_ASM */ - -/* Define if your MIPS CPU supports a 2-operand MADD16 instruction. */ -/* #undef HAVE_MADD16_ASM */ - -/* Define to enable diagnostic debugging support. */ -/* #undef DEBUG */ - -/* Define to disable debugging assertions. */ -/* #undef NDEBUG */ - -/* Define to enable experimental code. */ -/* #undef EXPERIMENTAL */ - - -/* Define to 1 if you have the header file. */ -#define HAVE_ASSERT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_ERRNO_H 1 - -/* Define to 1 if you have the `fcntl' function. */ -#define HAVE_FCNTL 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* Define to 1 if you have the `fork' function. */ -#define HAVE_FORK 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_INTTYPES_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_MEMORY_H */ - -/* Define to 1 if you have the `pipe' function. */ -#define HAVE_PIPE 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STDINT_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STDLIB_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STRINGS_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STRING_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_STAT_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have that is POSIX.1 compatible. */ -#define HAVE_SYS_WAIT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `waitpid' function. */ -#define HAVE_WAITPID 1 - -/* Name of package */ -#define PACKAGE "libmad" - -/* Define to the address where bug reports for this package should be sent. */ -/* #undef PACKAGE_BUGREPORT */ - -/* Define to the full name of this package. */ -/* #undef PACKAGE_NAME */ - -/* Define to the full name and version of this package. */ -/* #undef PACKAGE_STRING */ - -/* Define to the one symbol short name of this package. */ -/* #undef PACKAGE_TARNAME */ - -/* Define to the version of this package. */ -/* #undef PACKAGE_VERSION */ - -/* The size of a `int', as computed by sizeof. */ -#define SIZEOF_INT 4 - -/* The size of a `long', as computed by sizeof. */ -#define SIZEOF_LONG 4 - -/* The size of a `long long', as computed by sizeof. */ -#define SIZEOF_LONG_LONG 8 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Version number of package */ -#define VERSION "0.14.2b" - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ -/* #undef inline */ - -/* Define to `int' if does not define. */ -/* #undef pid_t */ -/***************************************************************************** - * End of automatically configured definitions * - *****************************************************************************/ - -# endif diff --git a/src/effects/nyquist/LoadNyquist.cpp b/src/effects/nyquist/LoadNyquist.cpp index cdac7e6b8..72a9d91e0 100644 --- a/src/effects/nyquist/LoadNyquist.cpp +++ b/src/effects/nyquist/LoadNyquist.cpp @@ -8,6 +8,8 @@ **********************************************************************/ +#include "../../Audacity.h" + #include "LoadNyquist.h" #include