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

diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
index 38fc347..abc10f5 100644 (file)
--- a/src/flac/Makefile.am
+++ b/src/flac/Makefile.am
@@ -47,9 +47,9 @@ flac_SOURCES = \
 
 flac_LDADD = \
        $(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/getopt/libgetopt.a \
+       $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
        $(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
        $(top_builddir)/src/libFLAC/libFLAC.la \
        @OGG_LIBS@ \

diff --git a/src/libFLAC/lpc.c b/src/libFLAC/lpc.c
index 4eccdc5..66a6899 100644 (file)
--- a/src/libFLAC/lpc.c
+++ b/src/libFLAC/lpc.c
@@ -61,7 +61,7 @@
 #elif defined(__GNUC__)
 #define copysign __builtin_copysign
 #endif
-inline long int lround(double x) {
+static inline long int lround(double x) {
     return (long)(x + copysign (0.5, x));
 }
 //If this fails, we are in the precence of a mid 90's compiler..move along...

diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am
index b1ee208..11b6310 100644 (file)
--- a/src/metaflac/Makefile.am
+++ b/src/metaflac/Makefile.am
@@ -43,8 +43,8 @@ metaflac_SOURCES = \
 metaflac_LDFLAGS =
 
 metaflac_LDADD = \
-       $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.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/utf8/libutf8.la \
        $(top_builddir)/src/libFLAC/libFLAC.la \