[vte] stream: Don't nest VteIv's definition

[Egmont Koblinger <egmontkob src gnome org>]

commit 669131f41aee180e8cdb994c09264e8ba4578b18
Author: Egmont Koblinger <egmont gmail com>
Date:   Thu Apr 23 12:17:17 2015 +0200

    stream: Don't nest VteIv's definition
    
    https://bugzilla.gnome.org/show_bug.cgi?id=748354

 src/vtestream-file.h |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/src/vtestream-file.h b/src/vtestream-file.h
index d8997d9..53f65d9 100644
--- a/src/vtestream-file.h
+++ b/src/vtestream-file.h
@@ -617,22 +617,26 @@ _vte_snake_class_init (VteSnakeClass *klass)
  * - T..64k (T..10): Area not written to the file, most of that leaving sparse FS blocks (dots for unit 
testing)
  */
 
-typedef struct _VteBoa {
-        VteSnake parent;
-        gsize tail, head;
-
 #if !defined VTESTREAM_MAIN && defined WITH_GNUTLS
-        gnutls_cipher_hd_t cipher_hd;
         /* The IV (nonce) consists of the offset within the stream, and an overwrite counter so that
          * we don't reuse the same IVs when a block at a certain logical offset is overwritten.
          * The padding is there to make sure the structure is at least VTE_CIPHER_IV_SIZE bytes large.
          * Assertion is made later that the real data fits in its first VTE_CIPHER_IV_SIZE bytes.
          */
-        struct _VteIv {
+        typedef struct _VteIv {
                 gsize offset;
                 guint32 overwrite_counter;
                 unsigned char padding[VTE_CIPHER_IV_SIZE];
-        } iv;
+        } VteIv;
+#endif
+
+typedef struct _VteBoa {
+        VteSnake parent;
+        gsize tail, head;
+
+#if !defined VTESTREAM_MAIN && defined WITH_GNUTLS
+        gnutls_cipher_hd_t cipher_hd;
+        VteIv iv;
 #endif
         int compressBound;
 } VteBoa;