[sr-dev] git:master:0a14914f: carrierroute: rename boolean type conflicting with clang sdtbool

Daniel-Constantin Mierla miconda at gmail.com
Wed May 30 20:19:50 CEST 2018


Module: kamailio
Branch: master
Commit: 0a14914fc1f98c18b9b75f66fe2e71f15147c9bf
URL: https://github.com/kamailio/kamailio/commit/0a14914fc1f98c18b9b75f66fe2e71f15147c9bf

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2018-05-30T20:17:11+02:00

carrierroute: rename boolean type conflicting with clang sdtbool

In file included from carrierroute.c:51:
./cr_db.h:92:2: error: expected identifier
        false = 0,
        ^
/usr/lib/clang/9.1.0/include/stdbool.h:33:15: note: expanded from
      macro 'false'
 #define false 0

---

Modified: src/modules/carrierroute/cr_db.c
Modified: src/modules/carrierroute/cr_db.h

---

Diff:  https://github.com/kamailio/kamailio/commit/0a14914fc1f98c18b9b75f66fe2e71f15147c9bf.diff
Patch: https://github.com/kamailio/kamailio/commit/0a14914fc1f98c18b9b75f66fe2e71f15147c9bf.patch

---

diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c
index 010f99d715..ce9667b38a 100644
--- a/src/modules/carrierroute/cr_db.c
+++ b/src/modules/carrierroute/cr_db.c
@@ -353,7 +353,7 @@ int load_route_data_db(struct route_data_t * rd) {
 		}
 	}
 	int n = 0;
-	boolean query_done = false;
+	crboolean query_done = crfalse;
 	do {
 		LM_DBG("loading, cycle %d", n++);
 		for (i = 0; i < RES_ROW_N(res); ++i) {
@@ -421,7 +421,7 @@ int load_route_data_db(struct route_data_t * rd) {
 				}
 				if(RES_ROW_N(prob_res) == 0) {
 					LM_ERR("Carrierroute db table contains route(s) with only 0 probability.\n");
-					query_done = true;
+					query_done = crtrue;
 				}
 				carrierroute_dbf.free_result(carrierroute_dbh, prob_res);
 				prob_res = NULL;
diff --git a/src/modules/carrierroute/cr_db.h b/src/modules/carrierroute/cr_db.h
index ffea731192..255b627c54 100644
--- a/src/modules/carrierroute/cr_db.h
+++ b/src/modules/carrierroute/cr_db.h
@@ -89,8 +89,8 @@ int load_route_data_db (struct route_data_t * rd);
 int load_user_carrier(str * user, str * domain);
 
 typedef enum {
-	false = 0,
-	true = 1
-} boolean;
+	crfalse = 0,
+	crtrue = 1
+} crboolean;
 
 #endif




More information about the sr-dev mailing list