Merge pull request #1168 from sippy/master_freebsd_fix

Fix some minor build issues on FreeBSD
OpenSIPS · Sep 21, 2017 · bf1c6de · bf1c6de
2 parents 1bd368b + 60c80b2
commit bf1c6de
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/lib/list.h b/lib/list.h
@@ -33,7 +33,7 @@ struct list_head {
 
 #define LIST_HEAD_INIT(name) { &(name), &(name) }
 
-#define LIST_HEAD(name) \
+#define OSIPS_LIST_HEAD(name) \
 	struct list_head name = LIST_HEAD_INIT(name)
 
 static inline void INIT_LIST_HEAD(struct list_head *list)

diff --git a/modules/cgrates/cgrates.c b/modules/cgrates/cgrates.c
@@ -64,7 +64,7 @@ static int pv_parse_idx_cgr(pv_spec_p sp, str *in);
 static int pv_get_cgr_reply(struct sip_msg *msg, pv_param_t *param,
 		pv_value_t *val);
 
-LIST_HEAD(cgrates_engines);
+OSIPS_LIST_HEAD(cgrates_engines);
 
 static cmd_export_t cmds[] = {
 	{"cgrates_acc", (cmd_function)w_cgr_acc, 0, fixup_cgrates_acc, 0,

diff --git a/modules/proto_tls/proto_tls.c b/modules/proto_tls/proto_tls.c
@@ -42,6 +42,8 @@
 #include <openssl/opensslv.h>
 #include <openssl/err.h>
 
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/tcp.h>
 #include <netinet/ip.h>

diff --git a/modules/rabbitmq/rmq_servers.c b/modules/rabbitmq/rmq_servers.c
@@ -87,7 +87,7 @@ static inline int rmq_parse(char *url, rmq_uri *uri)
 }
 #endif
 
-static LIST_HEAD(rmq_servers);
+static OSIPS_LIST_HEAD(rmq_servers);
 
 enum rmq_func_param_type { RMQT_SERVER, RMQT_PVAR };
 struct rmq_func_param {