Merge branch 'master' of http://47.108.26.175:53000/SisMaker/eGbh into master

src/gen_emm.erl

@@ -327,9 +327,9 @@ receiveIng(Parent, ServerName, HibernateAfterTimeout, EpmHers, Debug, IsHib) ->
          sys:handle_system_msg(Req, From, Parent, ?MODULE, Debug, {ServerName, HibernateAfterTimeout, EpmHers, IsHib}, IsHib);
       {'EXIT', Parent, Reason} ->
          terminate_server(Reason, Parent, ServerName, EpmHers);
-      {'$epm_call', From, Request} ->
+      {'$gen_call', From, Request} ->
          epmCallMsg(Parent, ServerName, HibernateAfterTimeout, EpmHers, Debug, From, Request);
-      {'$epm_info', CmdOrEmpHandler, Event} ->
+      {'$gen_info', CmdOrEmpHandler, Event} ->
          epmInfoMsg(Parent, ServerName, HibernateAfterTimeout, EpmHers, Debug, CmdOrEmpHandler, Event);
       Msg ->
          handleMsg(Parent, ServerName, HibernateAfterTimeout, EpmHers, Debug, Msg)