aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-09-07 05:41:54 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-09-07 05:41:54 +0000
commitef3bcb9c84742d4db91837d01fa0cc4215816a4b (patch)
tree5d86fa02efe5f449ef098dc2a23e7a9ea0985b9c /epan
parent6dc8a84eab3578fa33f325e2d237ce29e6829770 (diff)
Revert 44804 as it fails on most OSX and Windows buildbots
svn path=/trunk/; revision=44804
Diffstat (limited to 'epan')
-rw-r--r--epan/Makefile.am2
-rw-r--r--epan/libwireshark.def9
2 files changed, 1 insertions, 10 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 1981a204fc..b447ddb057 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -35,7 +35,7 @@ wslua_dir =
wslua_dist_dir = wslua
endif # HAVE_LIBLUA
-if HAVE_LIBPY
+if !HAVE_LIBPY
wspython_lib = wspython/libwspython.la
wspython_dir = wspython
wspython_dist_dir =
diff --git a/epan/libwireshark.def b/epan/libwireshark.def
index 08d9457927..78f00ffac4 100644
--- a/epan/libwireshark.def
+++ b/epan/libwireshark.def
@@ -1256,12 +1256,3 @@ xml_escape
xml_get_attrib
xml_get_cdata
xml_get_tag
-py_dissect
-py_dissector_name
-py_dissector_register
-py_dissector_args
-py_create_dissector_handle
-hf_register_info_create
-hf_register_info_destroy
-hf_register_info_add
-hf_register_info_print