Merge remote-tracking branch 'origin/migrate_rel10_rel14_to_make_version' into develop

This commit is contained in:
Cedric Roux
2018-06-18 16:25:39 +02:00
38 changed files with 168 additions and 166 deletions
+1 -1
View File
@@ -904,7 +904,7 @@ int main( int argc, char **argv )
#endif
//TTN for D2D
#ifdef Rel14
#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
printf ("RRC control socket\n");
rrc_control_socket_init();
printf ("PDCP PC5S socket\n");