cleanup code, less dependency

diff --git a/src/mod/xml_int/mod_xml_rpc/Makefile b/src/mod/xml_int/mod_xml_rpc/Makefile
index f0585dc3240669e5d9fc87184941fa1f885ca5ac..bc7e4c1de41c20ed7dc96dbf49d2182a7fcb9c2f 100644 (file)
--- a/src/mod/xml_int/mod_xml_rpc/Makefile
+++ b/src/mod/xml_int/mod_xml_rpc/Makefile
@@ -65,7 +65,7 @@ ws.o
 
 LOCAL_CFLAGS = -w -I$(XMLRPC_DIR)/lib/expat/xmlparse -I$(XMLRPC_DIR)/lib/expat/xmltok -I$(XMLRPC_DIR) -I$(XMLRPC_DIR)/include
 LOCAL_CFLAGS+= -I$(XMLRPC_DIR)/lib/abyss/src -I$(XMLRPC_DIR)/lib/util/include -D_THREAD -D__EXTENSIONS__
-LOCAL_CFLAGS+= -I. -I../../../../libs/sofia-sip/libsofia-sip-ua/su
+LOCAL_CFLAGS+= -I.
 
 include $(BASE)/build/modmake.rules
 

diff --git a/src/mod/xml_int/mod_xml_rpc/ws.c b/src/mod/xml_int/mod_xml_rpc/ws.c
index 1ef76e3cc9fde4f2fdd9a5978a2b3c57ef900f3f..40829ffe403bd7e1997b5786deaabf9366441ea0 100644 (file)
--- a/src/mod/xml_int/mod_xml_rpc/ws.c
+++ b/src/mod/xml_int/mod_xml_rpc/ws.c
@@ -1,5 +1,4 @@
 #include "ws.h"
-#include <pthread.h>
 
 #ifndef _MSC_VER
 #include <fcntl.h>

diff --git a/src/mod/xml_int/mod_xml_rpc/ws.h b/src/mod/xml_int/mod_xml_rpc/ws.h
index 06fd3b2594586534249455ddd44c67660ecfb0ad..f5cb5e820a93eb1bb8490fbd5999ebe06fc0eb08 100644 (file)
--- a/src/mod/xml_int/mod_xml_rpc/ws.h
+++ b/src/mod/xml_int/mod_xml_rpc/ws.h
@@ -11,24 +11,24 @@
 #include <arpa/inet.h>
 #include <sys/wait.h> 
 #include <sys/socket.h>
+#include <unistd.h>
 #else
 #pragma warning(disable:4996)
+#define snprintf _snprintf
 #endif
 #include <string.h>
-#include <unistd.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <errno.h>
-//#include "sha1.h"
 #include <openssl/ssl.h>
-#include <sofia-sip/su_types.h>
 #include <../lib/abyss/src/session.h>
 #include <../lib/abyss/src/conn.h>
 
 typedef TSession ws_tsession_t;
+typedef int issize_t;
 
 struct globals_s {
        const SSL_METHOD *ssl_method;