fixes for SEMS on Solaris

contributed by Richard Newman rnewman at twinql dot com

from diff-20080128T1116.udiff 



git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@636 8eb893ce-cfd4-0310-b710-fb5ebe64c474

Makefile.defs

@@ -41,7 +41,7 @@ ifeq ($(OS),solaris)
         # For inet_aton.
         LDFLAGS += -lresolv
 
-	exclude_modules += adpcm binrpcctrl gsm ilbc speex
+	exclude_modules += adpcm gsm ilbc speex
 else
 	GETARCH=uname -m
 endif

apps/callback/CallBack.cpp

@@ -141,7 +141,7 @@ AmSession* CallBackFactory::onInvite(const AmSipRequest& req)
     DBG("INVITE user '%s'\n", from_user.c_str());
     if (from_user.length()) {
       scheduled_calls_mut.lock();
-      scheduled_calls.insert(make_pair(now + cb_wait, from_user));
+      scheduled_calls.insert(std::make_pair(now + cb_wait, from_user));
       scheduled_calls_mut.unlock();
     }
     

apps/callback/CallBack.h

@@ -36,7 +36,6 @@
 
 #include <map>
 #include <string>
-using std::map;
 using std::string;
 
 #include <sys/types.h>

apps/diameter_client/DiameterClient.cpp

@@ -82,7 +82,7 @@ void DiameterClient::newConnection(const AmArg& args,
   sc->start();
   DBG("registering connection...\n");
   conn_mut.lock();
-  connections.insert(make_pair(app_name, sc));
+  connections.insert(std::make_pair(app_name, sc));
   conn_mut.unlock();
 
   ret.push(0);

apps/diameter_client/ServerConnection.cpp

@@ -92,7 +92,7 @@ void ServerConnection::process(AmEvent* ev) {
   gettimeofday(&now, NULL);
 
   req_map_mut.lock();
-  req_map[exe] = make_pair(re->sess_link, now);
+  req_map[exe] = std::make_pair(re->sess_link, now);
   req_map_mut.unlock();
 }
 

apps/examples/call_gen/CallGen.cpp

@@ -302,7 +302,7 @@ void CallGenFactory::scheduleCalls(const AmArg& args, AmArg& ret) {
   time(&now);
   actions_mut.lock();
   for (int i=0;i<ncalls;i++) {
-    actions.insert(make_pair(now, args));
+    actions.insert(std::make_pair(now, args));
     
     int wait_nsec = wait_time_base;
     if (wait_time_rand>0)

apps/examples/xmlrpc2di/XMLRPC2DI.cpp

@@ -144,7 +144,7 @@ void XMLRPC2DI::newConnection(const AmArg& args, AmArg& ret) {
   XMLRPCServerEntry* sc = new XMLRPCServerEntry(server_name, port, uri);
 
   server_mut.lock();
-  servers.insert(make_pair(app_name, sc));
+  servers.insert(std::make_pair(app_name, sc));
   server_mut.unlock();
 }
 

apps/ivr/Ivr.cpp

@@ -428,8 +428,8 @@ bool IvrFactory::loadScript(const string& path)
 
   PyObject_SetAttrString(mod,"config",config);
 
-  mod_reg.insert(make_pair(path,
-			   IvrScriptDesc(mod,dlg_class)));
+  mod_reg.insert(std::make_pair(path,
+			        IvrScriptDesc(mod,dlg_class)));
 
   return true;
 

apps/py_sems/PySems.cpp

@@ -384,8 +384,8 @@ bool PySemsFactory::loadScript(const string& path)
 
   PyObject_SetAttrString(mod,"config",config);
 
-  mod_reg.insert(make_pair(path,
-			   PySemsScriptDesc(mod,dlg_class, dt)));
+  mod_reg.insert(std::make_pair(path,
+			        PySemsScriptDesc(mod,dlg_class, dt)));
 
   return true;
 

apps/registrar_client/ContactInfo.cpp

@@ -28,7 +28,11 @@
 #include "ContactInfo.h"
 #include "log.h"
 
+// Not on Solaris!
+#if !defined (__SVR4) && !defined (__sun)
 #include <strings.h>
+#endif
+
 #include <iostream>
 using namespace std;
 

apps/voicemail/AnswerMachine.cpp

@@ -258,7 +258,7 @@ int AnswerMachineFactory::loadEmailTemplatesFromMySQL()
 
 int AnswerMachineFactory::loadEmailTemplates(const string& path)
 {
-  string email_tmpl_file = add2path(path, 1, 
+  std::string email_tmpl_file = add2path(path, 1, 
 				    (DEFAULT_MAIL_TMPL + "."
 				     + DEFAULT_MAIL_TMPL_EXT).c_str());
     

core/plug-in/gsm/gsm-1.0-pl10/Makefile

@@ -45,6 +45,7 @@ WAV49	=
 
 CC		= gcc -ansi -pedantic
 CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1 -fPIC
+MODULE_CFLAGS  = -I inc -DHAS_STDLIB_H
 
 LD 		= $(CC)