From 2af08da5e549f3e600110730634a08e1895a35e3 Mon Sep 17 00:00:00 2001
From: Josh Coalson <jcoalson@users.sourceforce.net>
Date: Thu, 29 Jul 2004 06:27:00 +0000
Subject: [PATCH] fix #include ordering to stop a warning caused by id3.h

---
 src/plugin_common/id3v2.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/plugin_common/id3v2.c b/src/plugin_common/id3v2.c
index c8ec6ec1..b18a1da3 100644
--- a/src/plugin_common/id3v2.c
+++ b/src/plugin_common/id3v2.c
@@ -20,8 +20,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include "id3v2.h"
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -41,8 +39,15 @@
 
 #define ID3V2_MAX_STRING_LEN 4096
 #define NUMBER_TRACK_FORMATED 1
+#endif
 
+/*
+ * This should come after #include<id3.h> because id3.h doesn't #undef
+ * true and false before redefining them, causing warnings.
+ */
+#include "id3v2.h"
 
+#ifdef FLAC__HAS_ID3LIB
 /* local__strip() based on glib's g_strchomp() and g_strchug():
  * GLIB - Library of useful routines for C programming
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald