X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=main.h;h=d6aee787b6c4dc38e8fcce46f2b92bc86b408cc8;hp=42387b0591a120a30a6bafd9565e7be5400fbebb;hb=b2a665f8f1cdeb7d02c3f665d95e6a80297e21d1;hpb=d9d954e58d6acf8c3de95402110e691f0bc29688 diff --git a/main.h b/main.h index 42387b0..d6aee78 100644 --- a/main.h +++ b/main.h @@ -34,7 +34,7 @@ #define DEFAULT_ENDPOINT_APP EndpointAppPBX -#define VERSION_STRING "0.5 (Spring 2007)" +#define VERSION_STRING "1.1 (Summer 2008)" extern int memuse; extern int mmemuse; @@ -47,20 +47,18 @@ extern int classuse; extern int fduse; extern int fhuse; -#ifdef SOCKET_MISDN +//extern pthread_mutex_t mutex_lcr; // lcr process mutex + extern FILE *debug_fp; -#else -extern int global_debug; -#endif #define PDEBUG(mask, fmt, arg...) _printdebug(__FUNCTION__, __LINE__, mask, fmt, ## arg) #define PERROR(fmt, arg...) _printerror(__FUNCTION__, __LINE__, fmt, ## arg) #define PDEBUG_RUNTIME(mask, fmt, arg...) _printdebug(NULL, 0, mask, fmt, ## arg) #define PERROR_RUNTIME(fmt, arg...) _printerror(NULL, 0, fmt, ## arg) -void _printdebug(const char *function, int line, unsigned long mask, const char *fmt, ...); +void _printdebug(const char *function, int line, unsigned int mask, const char *fmt, ...); void _printerror(const char *function, int line, const char *fmt, ...); #define DEBUG_FUNC -void debug(const char *function, int line, char *prefix, char *buffer); +void debug(const char *function, int line, const char *prefix, char *buffer); #define DEBUG_CONFIG 0x0001 #define DEBUG_MSG 0x0002 @@ -123,7 +121,7 @@ void debug(const char *function, int line, char *prefix, char *buffer); #ifdef BUDETECT_DEF #define BUDETECT budetect(__FILE__, __LINE__, __FUNCTION__); - void budetect(const char *file, int line, char *function); + void budetect(const char *file, int line, const char *function); #else #define BUDETECT ; #endif @@ -131,10 +129,7 @@ void debug(const char *function, int line, char *prefix, char *buffer); #ifdef __cplusplus extern "C" { #endif -#ifndef SOCKET_MISDN -#include -#include -#endif +#include #ifdef __cplusplus } #endif @@ -146,6 +141,7 @@ extern "C" { #include "endpoint.h" #include "endpointapp.h" #include "apppbx.h" +#include "callerid.h" #include "route.h" #include "port.h" #include "mISDN.h"