[easytag] Fix FLAC build when Ogg support is disabled

[David King <davidk src gnome org>]

commit 3cc462ce2c122d981d9f3eb492de65871aff5b8b
Author: David King <amigadave amigadave com>
Date:   Tue Mar 15 15:56:10 2016 +0000

    Fix FLAC build when Ogg support is disabled
    
    Move the defines for the Vorbis comment field names to be outside the
    ENABLE_OGG checks, and eanble them at all times.
    
    https://bugs.gentoo.org/show_bug.cgi?id=576490

 src/tags/vcedit.h |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/tags/vcedit.h b/src/tags/vcedit.h
index f88d6c0..48b569c 100644
--- a/src/tags/vcedit.h
+++ b/src/tags/vcedit.h
@@ -22,25 +22,10 @@
 
 #include "config.h"
 
-#ifdef ENABLE_OGG
-
 #include <gio/gio.h>
 
 G_BEGIN_DECLS
 
-#include <ogg/ogg.h>
-#include <vorbis/codec.h>
-
-#ifdef ENABLE_OPUS
-#include <opus/opus.h>
-#include <opus/opusfile.h>
-#endif
-
-#ifdef ENABLE_SPEEX
-#include <speex/speex.h>
-#include <speex/speex_header.h>
-#endif
-
 /* Ogg Vorbis fields names in (most of) ASCII, excluding '=':
  * http://www.xiph.org/vorbis/doc/v-comment.html
  *
@@ -95,6 +80,21 @@ G_BEGIN_DECLS
 #define ET_VORBIS_COMMENT_FIELD_COVER_ART_DESCRIPTION "COVERARTDESCRIPTION"
 #define ET_VORBIS_COMMENT_FIELD_METADATA_BLOCK_PICTURE "METADATA_BLOCK_PICTURE"
 
+#ifdef ENABLE_OGG
+
+#include <ogg/ogg.h>
+#include <vorbis/codec.h>
+
+#ifdef ENABLE_OPUS
+#include <opus/opus.h>
+#include <opus/opusfile.h>
+#endif
+
+#ifdef ENABLE_SPEEX
+#include <speex/speex.h>
+#include <speex/speex_header.h>
+#endif
+
 typedef enum
 {
     ET_OGG_KIND_VORBIS,
@@ -114,8 +114,8 @@ const SpeexHeader * vcedit_speex_header (EtOggState *state);
 int vcedit_open (EtOggState *state, GFile *in, GError **error);
 int vcedit_write (EtOggState *state, GFile *file, GError **error);
 
-G_END_DECLS
-
 #endif /* ENABLE_OGG */
 
+G_END_DECLS
+
 #endif /* ET_VCEDIT_H_ */