cleanup code, less dependency

This commit is contained in:
Seven Du 2013-07-31 15:34:20 +08:00
parent 5b5b231164
commit 7d48b0b3cc
3 changed files with 4 additions and 5 deletions

View File

@ -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 = -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$(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 include $(BASE)/build/modmake.rules

View File

@ -1,5 +1,4 @@
#include "ws.h" #include "ws.h"
#include <pthread.h>
#ifndef _MSC_VER #ifndef _MSC_VER
#include <fcntl.h> #include <fcntl.h>

View File

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