Commit fb13acc4 authored by Erik de Castro Lopo's avatar Erik de Castro Lopo
Browse files

Revert parts of 96d081c1 that touched source code or autotools files.

parent f67928de
...@@ -47,9 +47,9 @@ flac_SOURCES = \ ...@@ -47,9 +47,9 @@ flac_SOURCES = \
flac_LDADD = \ flac_LDADD = \
$(top_builddir)/src/share/utf8/libutf8.la \ $(top_builddir)/src/share/utf8/libutf8.la \
$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
$(top_builddir)/src/share/grabbag/libgrabbag.la \ $(top_builddir)/src/share/grabbag/libgrabbag.la \
$(top_builddir)/src/share/getopt/libgetopt.a \ $(top_builddir)/src/share/getopt/libgetopt.a \
$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \ $(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
$(top_builddir)/src/libFLAC/libFLAC.la \ $(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \ @OGG_LIBS@ \
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
#elif defined(__GNUC__) #elif defined(__GNUC__)
#define copysign __builtin_copysign #define copysign __builtin_copysign
#endif #endif
inline long int lround(double x) { static inline long int lround(double x) {
return (long)(x + copysign (0.5, x)); return (long)(x + copysign (0.5, x));
} }
//If this fails, we are in the precence of a mid 90's compiler..move along... //If this fails, we are in the precence of a mid 90's compiler..move along...
......
...@@ -43,8 +43,8 @@ metaflac_SOURCES = \ ...@@ -43,8 +43,8 @@ metaflac_SOURCES = \
metaflac_LDFLAGS = metaflac_LDFLAGS =
metaflac_LDADD = \ metaflac_LDADD = \
$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
$(top_builddir)/src/share/grabbag/libgrabbag.la \ $(top_builddir)/src/share/grabbag/libgrabbag.la \
$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
$(top_builddir)/src/share/getopt/libgetopt.a \ $(top_builddir)/src/share/getopt/libgetopt.a \
$(top_builddir)/src/share/utf8/libutf8.la \ $(top_builddir)/src/share/utf8/libutf8.la \
$(top_builddir)/src/libFLAC/libFLAC.la \ $(top_builddir)/src/libFLAC/libFLAC.la \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment