Move the definition of enum rohc_mode into packet-rohc.h.

Have packet-pdcp-lte.h include packet-rohc.h to pick up that definition.

Get rid of now-no-longer-necessary includes.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40123 f5534014-38df-0310-8fa8-9805f1628bb7

4 files changed, 9 insertions, 11 deletions

diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index 0feaa249a6..90b578b6ca 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -36,7 +36,6 @@
 #include <epan/emem.h>
 
 #include "packet-pdcp-lte.h"
-#include "packet-rohc.h"
 
 /* Described in:
  * 3GPP TS 36.323 Evolved Universal Terrestrial Radio Access (E-UTRA)
diff --git a/epan/dissectors/packet-pdcp-lte.h b/epan/dissectors/packet-pdcp-lte.h
index aacee19b01..db44759057 100644
--- a/epan/dissectors/packet-pdcp-lte.h
+++ b/epan/dissectors/packet-pdcp-lte.h
@@ -23,6 +23,8 @@
  */
 
 
+#include "packet-rohc.h"
+
 /* Direction */
 #define DIRECTION_UPLINK   0
 #define DIRECTION_DOWNLINK 1
@@ -33,13 +35,6 @@ enum pdcp_plane
   USER_PLANE = 2
 };
 
-enum rohc_mode
-{
-  UNIDIRECTIONAL = 1,
-  OPTIMISTIC_BIDIRECTIONAL = 2,
-  RELIABLE_BIDIRECTIONAL = 3
-};
-
 typedef enum LogicalChannelType
 {
     Channel_DCCH=1,
diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c
index 6e256df96c..0a18d33fb1 100644
--- a/epan/dissectors/packet-rohc.c
+++ b/epan/dissectors/packet-rohc.c
@@ -40,7 +40,6 @@
 #include <epan/rtp_pt.h>
 #include <epan/expert.h>
 
-#include "packet-pdcp-lte.h"
 #include "packet-rohc.h"
 /* Initialize the protocol and registered fields */
 static int proto_rohc			= -1;
diff --git a/epan/dissectors/packet-rohc.h b/epan/dissectors/packet-rohc.h
index f51d5c7994..a9b803ba06 100644
--- a/epan/dissectors/packet-rohc.h
+++ b/epan/dissectors/packet-rohc.h
@@ -32,10 +32,15 @@
 #ifndef PACKET_ROHC_H
 #define PACKET_ROHC_H
 
-typedef struct rohc_info
+enum rohc_mode
 {
+  UNIDIRECTIONAL = 1,
+  OPTIMISTIC_BIDIRECTIONAL = 2,
+  RELIABLE_BIDIRECTIONAL = 3
+};
 
-    /* RoHC settings */
+typedef struct rohc_info
+{
     gboolean           rohc_compression;
     unsigned short     rohc_ip_version;
     gboolean           cid_inclusion_info;