remove asn1 compilation fixes that went to asn1c (IMPORTANT: reinstall asn1c!)
The files NativeInteger.c.diff and constr_SET_OF.c.diff from asn1c were generating compilation warnings. We had local patches applied on generated files by asn1c. A new version of asn1c has been pushed to https://gitlab.eurecom.fr/oai/asn1c (commit 224dc1f991b7e7ad705ce92e171b942f87b7b7e7) making obsolete the fixes we do here. So we now remove those fixes. ************************* * IMPORTANT BEGIN * ************************* Everyone should update their asn1c installation. The simplest is to do: source oaienv cd cmake_targets ./build_oai -I ************************* * IMPORTANT END * *************************
This commit is contained in:
@@ -9,13 +9,6 @@ RRC_Rel10=(
|
|||||||
|
|
||||||
X2AP_Rel11_2=(
|
X2AP_Rel11_2=(
|
||||||
"X2ap-CriticalityDiagnostics-IE-List.h" ae96308b37fcbcbf39da5012e42968135fc5f27b "fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff"
|
"X2ap-CriticalityDiagnostics-IE-List.h" ae96308b37fcbcbf39da5012e42968135fc5f27b "fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff"
|
||||||
"NativeInteger.c" 1a55f5402fd363318cf5444ffe1f67530dcf66ff "fix_asn1.data/X2AP.rel11.2/NativeInteger.c.diff"
|
|
||||||
"constr_SET_OF.c" 808cbbdf19b118c0bdb04e3acf2cbe6e4133be2b "fix_asn1.data/X2AP.rel11.2/constr_SET_OF.c.diff"
|
|
||||||
)
|
|
||||||
|
|
||||||
S1AP_Rel10_5=(
|
|
||||||
"NativeInteger.c" 1a55f5402fd363318cf5444ffe1f67530dcf66ff "fix_asn1.data/S1AP.rel10.5/NativeInteger.c.diff"
|
|
||||||
"constr_SET_OF.c" 808cbbdf19b118c0bdb04e3acf2cbe6e4133be2b "fix_asn1.data/S1AP.rel10.5/constr_SET_OF.c.diff"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
red_color="$(tput setaf 1)"
|
red_color="$(tput setaf 1)"
|
||||||
@@ -130,8 +123,7 @@ function patch_s1ap()
|
|||||||
|
|
||||||
case "$version" in
|
case "$version" in
|
||||||
R10 )
|
R10 )
|
||||||
echo "patching S1AP files release 10.5"
|
#nothing to do anymore (fixes went to asn1c)
|
||||||
apply_patches "$directory" S1AP_Rel10_5 ${#S1AP_Rel10_5[*]}
|
|
||||||
;;
|
;;
|
||||||
* )
|
* )
|
||||||
error unknwon/unhandled S1AP version \'"$version"\'
|
error unknwon/unhandled S1AP version \'"$version"\'
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
283c283
|
|
||||||
< int dynamic = 0;
|
|
||||||
---
|
|
||||||
> //int dynamic = 0;
|
|
||||||
290c290
|
|
||||||
< dynamic = 1;
|
|
||||||
---
|
|
||||||
> //dynamic = 1;
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
1007c1007
|
|
||||||
< (int)nelems, (int)ct ? ct->effective_bits : -1);
|
|
||||||
---
|
|
||||||
> (int)nelems, ct ? ct->effective_bits : -1);
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
283c283
|
|
||||||
< int dynamic = 0;
|
|
||||||
---
|
|
||||||
> //int dynamic = 0;
|
|
||||||
290c290
|
|
||||||
< dynamic = 1;
|
|
||||||
---
|
|
||||||
> //dynamic = 1;
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
1007c1007
|
|
||||||
< (int)nelems, (int)ct ? ct->effective_bits : -1);
|
|
||||||
---
|
|
||||||
> (int)nelems, ct ? ct->effective_bits : -1);
|
|
||||||
Reference in New Issue
Block a user