[sr-dev] git:master:b37aa66f: db_postgress: fix compilation, NTOHLL and NTOHLL provided by OSX 10.10

Daniel-Constantin Mierla miconda at gmail.com
Thu Nov 19 13:45:25 CET 2015


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

Author: Daniel Rus Morales <danirus at eml.cc>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2015-11-19T13:44:08+01:00

db_postgress: fix compilation, NTOHLL and NTOHLL provided by OSX 10.10

---

Modified: modules/db_postgres/pg_fld.c

---

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

---

diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c
index 46d54f0..de62c14 100644
--- a/modules/db_postgres/pg_fld.c
+++ b/modules/db_postgres/pg_fld.c
@@ -93,19 +93,23 @@ union ull {
 	uint32_t ui32[2];
 };
 
+#if !defined(__OS_darwin) || (defined(__OS_darwin) && !defined(NTOHLL))
 static inline uint64_t htonll(uint64_t in)
 {
 	union ull* p = (union ull*)∈
 	
 	return ((uint64_t)htonl(p->ui32[0]) << 32) + (uint64_t)htonl(p->ui32[1]);
 }
+#endif
 
 
+#if !defined(__OS_darwin) || (defined(__OS_darwin) && !defined(NTOHLL))
 static inline uint64_t ntohll(uint64_t in)
 {
 	union ull* p = (union ull*)∈
 	return ((uint64_t)ntohl(p->ui32[0]) << 32) + (uint64_t)ntohl(p->ui32[1]);
 }
+#endif
 
 
 static inline void db_int2pg_int4(struct pg_params* dst, int i, 




More information about the sr-dev mailing list