Browse code

- fixed cfg.y for icc (hack) - many other small fixes

Andrei Pelinescu-Onciul authored on 02/11/2002 01:35:08
Showing 6 changed files
... ...
@@ -22,6 +22,8 @@ Requirements:
22 22
 - GNU tar ("gtar" on Solaris) and gzip if you want "make tar" to work
23 23
 - GNU install or BSD install (on Solaris "ginstall") if you want "make
24 24
   install", "make bin", "make sunpkg" to work
25
+- libmysqlclient & libz (zlib) if you want mysql support (the mysql module)
26
+- libxpat if you want the jabber gateway support (the jabber module)
25 27
 
26 28
 
27 29
 OS Notes:
... ...
@@ -459,7 +459,6 @@ ifeq ($(YACC),)
459 459
 	YACC=bison
460 460
 endif
461 461
 YACC_FLAGS=-d -b cfg
462
-# on linux and freebsd keep it empty (e.g. LIBS= )
463 462
 # on solaris add -lxnet (e.g. LIBS= -lxnet)
464 463
 LIBS= -lfl -ldl -lresolv
465 464
 
... ...
@@ -484,7 +483,7 @@ ifeq  ($(OS), solaris)
484 484
 ifeq ($(CC_NAME), suncc)
485 485
 	LIBS= -lfast -ldl -lresolv
486 486
 endif
487
-	LIBS+= -L/usr/local/lib -lfl -L/usr/lib/mysql -lxnet -lrt -lnsl 
487
+	LIBS+= -L/usr/local/lib -lfl -lxnet -lrt -lnsl 
488 488
 	# -lrt needed for sched_yield
489 489
 endif
490 490
 
... ...
@@ -32,7 +32,7 @@ x fix via address someday
32 32
 - fix listen=0.0.0.0 case
33 33
 x forward to received= if present
34 34
 - make it easier to register a statically linkable module.
35
-- add support for -u user and -g group (not only -u uid, -g uid)
35
+x add support for -u user and -g group (not only -u uid, -g uid)
36 36
 - change uid/gid after opening the sockets
37 37
 - add -t, -w, -u -g equivalents to the config file
38 38
 - exec improvments (add format strings to it)
... ...
@@ -47,7 +47,7 @@ x handle SIGCHLD, SIGHUP
47 47
 - try & use native compiler & ld if possible
48 48
 
49 49
 x make install
50
-- init.d scripts (and rc.local? for *BSD or Slackware)
50
+x init.d scripts (and rc.local? for *BSD or Slackware)
51 51
 x man page
52 52
 - autoconf scripts
53 53
 x Debian package build files
... ...
@@ -29,6 +29,9 @@
29 29
 #include <dmalloc.h>
30 30
 #endif
31 31
 
32
+/* hack to avoid alloca usage in the generated C file (needed for compiler
33
+ with no built in alloca, like icc*/
34
+#undef _ALLOCA_H
32 35
 
33 36
 struct id_list{
34 37
 	char* s;
... ...
@@ -82,7 +82,7 @@
82 82
 
83 83
 static char id[]="@(#) $Id$";
84 84
 static char version[]=  NAME " " VERSION " (" ARCH "/" OS ")" ;
85
-static char compiled[]= __TIME__ __DATE__ ;
85
+static char compiled[]= __TIME__ " " __DATE__ ;
86 86
 static char flags[]=
87 87
 "STATS:"
88 88
 #ifdef STATS
... ...
@@ -151,7 +151,7 @@ int uac_init() {
151 151
 int uac_child_init( int rank ) 
152 152
 {
153 153
 	callid_suffix_len=snprintf(callid_suffix,CALLID_SUFFIX_LEN,
154
-			"%c%d@%*s", CID_SEP, my_pid(), 
154
+			"%c%d@%.*s", CID_SEP, my_pid(), 
155 155
 			sock_info[bind_idx].address_str.len,
156 156
 			sock_info[bind_idx].address_str.s );
157 157
 	if (callid_suffix_len==-1) {
... ...
@@ -219,7 +219,6 @@ int t_uac( str *msg_type, str *dst,
219 219
 	DBG("DEBUG: sufix_len = %d\n",callid_suffix_len);
220 220
 	DBG("DEBUG: NEW CALLID:%.*s[%d]:\n", callid_s.len, callid_s.s 
221 221
 		, callid_s.len);
222
-
223 222
 	new_cell = build_cell( NULL ) ; 
224 223
 	if (!new_cell) {
225 224
 		ret=E_OUT_OF_MEM;