Browse code

- warning fixes - s/T_LOG/T_LOG_CELL in tm (redefinition conflict with nameser_compat.h) - fixed type in vm

Andrei Pelinescu-Onciul authored on 24/02/2003 16:48:50
Showing 3 changed files
... ...
@@ -29,6 +29,8 @@
29 29
  * History:
30 30
  * -------
31 31
  *  2003-02-13  proto support added (andrei)
32
+ *  2003-02-24  s/T_NULL/T_NULL_CELL/ to avoid redefinition conflict w/
33
+ *              nameser_compat.h (andrei)
32 34
  */
33 35
 
34 36
 #include "defs.h"
... ...
@@ -367,7 +369,7 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg ,
367 367
 
368 368
 	if (p_msg->REQ_METHOD==METHOD_CANCEL) {
369 369
 		t_invite=t_lookupOriginalT(  p_msg );
370
-		if (t_invite!=T_NULL) {
370
+		if (t_invite!=T_NULL_CELL) {
371 371
 			e2e_cancel( p_msg, t, t_invite );
372 372
 			UNREF(t_invite);
373 373
 			return 1;
... ...
@@ -55,6 +55,8 @@
55 55
  * 2003-01-27  next baby-step to removing ZT - PRESERVE_ZT (jiri)
56 56
  * 2003-01-23  options for disabling r-uri matching introduced (jiri)
57 57
  * 2003-02-13  init_rb() is proto indep. & it uses struct dest_info (andrei)
58
+ * 2003-02-24  s/T_NULL/T_NULL_CELL/ to avoid redefinition conflict w/
59
+ *              nameser_compat.h (andrei)
58 60
  */
59 61
 
60 62
 
... ...
@@ -925,7 +927,7 @@ int t_newtran( struct sip_msg* p_msg )
925 925
 
926 926
 int t_unref( struct sip_msg* p_msg  )
927 927
 {
928
-	if (T==T_UNDEFINED || T==T_NULL)
928
+	if (T==T_UNDEFINED || T==T_NULL_CELL)
929 929
 		return -1;
930 930
 	if (T->kr==0 
931 931
 		||(p_msg->REQ_METHOD==METHOD_ACK && !(T->kr & REQ_RLSD))) {
... ...
@@ -24,6 +24,12 @@
24 24
  * along with this program; if not, write to the Free Software 
25 25
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
26 26
  */
27
+/*
28
+ * History:
29
+ * --------
30
+ *  2003-02-24  s/T_NULL/T_NULL_CELL/ to avoid redefinition conflict w/
31
+ *               nameser_compat.h (andrei)
32
+ */
27 33
 
28 34
 
29 35
 
... ...
@@ -37,7 +43,7 @@
37 37
 #include "t_funcs.h"
38 38
 
39 39
 #define T_UNDEFINED  ( (struct cell*) -1 )
40
-#define T_NULL       ( (struct cell*) 0 )
40
+#define T_NULL_CELL       ( (struct cell*) 0 )
41 41
 
42 42
 #ifdef _OBSOLETED
43 43
 extern struct cell      *T;