From 4193e9c318530237c69e692ed1dd400c9cb34f6d Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Thu, 2 Feb 2012 20:35:48 +0000 Subject: [PATCH] Rather than rename the remaining HI2Operations source files in asn1/ (to fix building of the dissector and make distcheck), revert 40803 and 40801. svn path=/trunk/; revision=40811 --- asn1/HI2Operations/Makefile.common | 2 +- epan/CMakeLists.txt | 2 +- epan/dissectors/Makefile.common | 2 +- .../{packet-hi2operations.c => packet-HI2Operations.c} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename epan/dissectors/{packet-hi2operations.c => packet-HI2Operations.c} (100%) diff --git a/asn1/HI2Operations/Makefile.common b/asn1/HI2Operations/Makefile.common index 3ecdedf902..7dbe9f5be5 100644 --- a/asn1/HI2Operations/Makefile.common +++ b/asn1/HI2Operations/Makefile.common @@ -20,7 +20,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -PROTOCOL_NAME=hi2operations +PROTOCOL_NAME=HI2Operations ASN_FILE_LIST = HI2Operations_ver11.asn \ UmtsHI2Operations.asn \ diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 85479d9b1d..f38c49cf21 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -202,6 +202,7 @@ set(ASN1_DISSECTOR_SRC dissectors/packet-ess.c dissectors/packet-ftam.c dissectors/packet-goose.c + dissectors/packet-HI2Operations.c dissectors/packet-h225.c dissectors/packet-h235.c dissectors/packet-h245.c @@ -213,7 +214,6 @@ set(ASN1_DISSECTOR_SRC dissectors/packet-h450-ros.c dissectors/packet-h460.c dissectors/packet-h501.c - dissectors/packet-hi2operations.c dissectors/packet-hnbap.c dissectors/packet-idmp.c dissectors/packet-inap.c diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 47fec5b57f..3cb199a8a9 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -116,6 +116,7 @@ ASN1_DISSECTOR_SRC = \ packet-ess.c \ packet-ftam.c \ packet-goose.c \ + packet-HI2Operations.c \ packet-h225.c \ packet-h235.c \ packet-h245.c \ @@ -127,7 +128,6 @@ ASN1_DISSECTOR_SRC = \ packet-h450-ros.c \ packet-h460.c \ packet-h501.c \ - packet-hi2operations.c \ packet-hnbap.c \ packet-idmp.c \ packet-inap.c \ diff --git a/epan/dissectors/packet-hi2operations.c b/epan/dissectors/packet-HI2Operations.c similarity index 100% rename from epan/dissectors/packet-hi2operations.c rename to epan/dissectors/packet-HI2Operations.c