aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Roland <Lars.Roland@gmx.net>2005-02-08 19:36:20 +0000
committerLars Roland <Lars.Roland@gmx.net>2005-02-08 19:36:20 +0000
commitfe83d6527b4133f3de367e35cc73ee602354e126 (patch)
tree7d5f8f6122ca1112b06b7b6910f79889f0b19082
parent8b1d64e0f2c2509de69a865673fa5bf6cb991040 (diff)
Move h225-persistentdata.[ch] to epan,
as its code is linked into libethereal.dll. svn path=/trunk/; revision=13354
-rw-r--r--Makefile.common1
-rw-r--r--asn1/h225/packet-h225-template.c2
-rw-r--r--epan/Makefile.common3
-rw-r--r--epan/dissectors/packet-h225.c2
-rw-r--r--epan/h225-persistentdata.c (renamed from h225-persistentdata.c)0
-rw-r--r--epan/h225-persistentdata.h (renamed from h225-persistentdata.h)0
6 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.common b/Makefile.common
index 11fbef7db1..4adc7dfa7a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -35,7 +35,6 @@ DISSECTOR_SUPPORT_INCLUDES = \
follow.h \
format-oid.h \
greproto.h \
- h225-persistentdata.h \
iax2_codec_type.h \
ip_opts.h \
isprint.h \
diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c
index 993eeddfa3..269efea3ad 100644
--- a/asn1/h225/packet-h225-template.c
+++ b/asn1/h225/packet-h225-template.c
@@ -49,7 +49,7 @@
#include "packet-per.h"
#include "packet-h225.h"
#include <epan/t35.h>
-#include "h225-persistentdata.h"
+#include <epan/h225-persistentdata.h>
#include "packet-ber.h"
#include "packet-h235.h"
#include "packet-h245.h"
diff --git a/epan/Makefile.common b/epan/Makefile.common
index 88244e1ad3..f6d7e22526 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -46,6 +46,7 @@ LIBETHEREAL_SRC = \
except.c \
filesystem.c \
frame_data.c \
+ h225-persistentdata.c \
in_cksum.c \
ipproto.c \
ipv4.c \
@@ -99,6 +100,7 @@ LIBETHEREAL_INCLUDES = \
filesystem.h \
frame_data.h \
gdebug.h \
+ h225-persistentdata.h \
in_cksum.h \
ipproto.h \
ipv4.h \
@@ -134,7 +136,6 @@ LIBETHEREAL_INCLUDES = \
DISSECTOR_SUPPORT_SRC = \
../asn1.c \
../follow.c \
- ../h225-persistentdata.c \
../ptvcursor.c \
../reassemble.c \
../xmlstub.c
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index 169bdc6e0e..8da617f4b6 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -56,7 +56,7 @@
#include "packet-per.h"
#include "packet-h225.h"
#include <epan/t35.h>
-#include "h225-persistentdata.h"
+#include <epan/h225-persistentdata.h>
#include "packet-ber.h"
#include "packet-h235.h"
#include "packet-h245.h"
diff --git a/h225-persistentdata.c b/epan/h225-persistentdata.c
index 4cb1d6f3bc..4cb1d6f3bc 100644
--- a/h225-persistentdata.c
+++ b/epan/h225-persistentdata.c
diff --git a/h225-persistentdata.h b/epan/h225-persistentdata.h
index aed7972c5f..aed7972c5f 100644
--- a/h225-persistentdata.h
+++ b/epan/h225-persistentdata.h