Commit 418085fe authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix compilation errors.

parent d2025a63
......@@ -377,7 +377,7 @@ BELLESIP_INTERNAL_EXPORT unsigned int belle_sip_random(void);
belle_sip_parameters_set_parameter(BELLE_SIP_PARAMETERS(obj),#attribute,NULL);\
}
#if HAVE_ANTLR_STRING_STREAM_NEW
#ifdef HAVE_ANTLR_STRING_STREAM_NEW
#define ANTLR_STREAM_NEW(object_type, value,length) \
antlr3StringStreamNew((pANTLR3_UINT8)value,ANTLR3_ENC_8BIT,(ANTLR3_UINT32)length,(pANTLR3_UINT8)#object_type)
#else
......
......@@ -201,7 +201,6 @@ static int tls_process_handshake(belle_sip_channel_t *obj){
static int tls_process_data(belle_sip_channel_t *obj,unsigned int revents){
belle_sip_tls_channel_t* channel=(belle_sip_tls_channel_t*)obj;
int err;
if (obj->state == BELLE_SIP_CHANNEL_CONNECTING ) {
if (!channel->socket_connected) {
......
......@@ -22,7 +22,7 @@
#include <stdio.h>
#include "CUnit/Basic.h"
#if HAVE_CU_CURSES
#ifdef HAVE_CU_CURSES
#include "CUnit/CUCurses.h"
#endif
#include <belle-sip/belle-sip.h>
......@@ -35,7 +35,7 @@ static test_suite_t **test_suite = NULL;
static int nb_test_suites = 0;
#if HAVE_CU_CURSES
#ifdef HAVE_CU_CURSES
static unsigned char curses = 0;
#endif
......@@ -163,7 +163,7 @@ int belle_sip_tester_run_tests(const char *suite_name, const char *test_name) {
}
pool=belle_sip_object_pool_push();
#if HAVE_CU_GET_SUITE
#ifdef HAVE_CU_GET_SUITE
if (suite_name){
CU_pSuite suite;
CU_basic_set_mode(CU_BRM_VERBOSE);
......@@ -184,7 +184,7 @@ int belle_sip_tester_run_tests(const char *suite_name, const char *test_name) {
} else
#endif
{
#if HAVE_CU_CURSES
#ifdef HAVE_CU_CURSES
if (curses) {
/* Run tests using the CUnit curses interface */
CU_curses_run_tests();
......@@ -223,11 +223,11 @@ int main (int argc, char *argv[]) {
"\t\t\t--verbose\n"
"\t\t\t--domain <test sip domain>\n"
"\t\t\t--auth-domain <test auth domain>\n"
#if HAVE_CU_GET_SUITE
#ifdef HAVE_CU_GET_SUITE
"\t\t\t--suite <suite name>\n"
"\t\t\t--test <test name>\n"
#endif
#if HAVE_CU_CURSES
#ifdef HAVE_CU_CURSES
"\t\t\t--curses\n"
#endif
, argv[0]);
......@@ -242,7 +242,7 @@ int main (int argc, char *argv[]) {
i++;
auth_domain=argv[i];
}
#if HAVE_CU_GET_SUITE
#ifdef HAVE_CU_GET_SUITE
else if (strcmp(argv[i],"--test")==0){
i++;
test_name=argv[i];
......@@ -251,7 +251,7 @@ int main (int argc, char *argv[]) {
suite_name=argv[i];
}
#endif
#if HAVE_CU_CURSES
#ifdef HAVE_CU_CURSES
else if (strcmp(argv[i], "--curses") == 0) {
i++;
curses = 1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment