changes in external structure of asn1_ctx_t

svn path=/trunk/; revision=21714

1 files changed, 6 insertions, 6 deletions

diff --git a/epan/asn1.h b/epan/asn1.h
index 33a93cd89f..0b9ca717c4 100644
--- a/epan/asn1.h
+++ b/epan/asn1.h
@@ -43,6 +43,12 @@ typedef struct _asn1_ctx_t {
   struct {
     tvbuff_t *data_value_descriptor;
     int hf_index;
+    tvbuff_t *direct_reference;
+    gint32 indirect_reference;
+    guint32 encoding;
+    tvbuff_t *single_asn1_type;
+    tvbuff_t *octet_aligned;
+    tvbuff_t *arbitrary;
     union {
       struct {
 		int (*ber_callback)(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, struct _asn1_ctx_t*);
@@ -55,12 +61,6 @@ typedef struct _asn1_ctx_t {
       } ber;
       struct {
         int (*type_cb)(tvbuff_t*, int, struct _asn1_ctx_t*, proto_tree*, int);
-        tvbuff_t *direct_reference;
-        gint32 indirect_reference;
-        guint32 encoding;
-        tvbuff_t *single_asn1_type;
-        tvbuff_t *octet_aligned;
-        tvbuff_t *arbitrary;
       } per;
     };
   } external;