[sr-dev] git:kamailio_3.0: presence_dialoginfo(k): fix bsd compilation
Andrei Pelinescu-Onciul
andrei at iptel.org
Thu Aug 19 16:22:28 CEST 2010
Module: sip-router
Branch: kamailio_3.0
Commit: cc3351c1b9ee0df6aa43c6382cf577c382687043
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc3351c1b9ee0df6aa43c6382cf577c382687043
Author: Andrei Pelinescu-Onciul <andrei at iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
Date: Wed Aug 11 19:31:14 2010 +0200
presence_dialoginfo(k): fix bsd compilation
On FreeBSD don't define _XOPEN_SOURCE (define it only on linux).
It's not needed for strptime() and worse will cause some other
defines to be missing, like INADDR_LOOPBACK ( if_XOPEN_SOURCE
is defined, __BSD_VISIBLE will be undefined => lots of missing
defines).
Reported-by: Reported-by: Olle E. Johansson oej edvina net
(cherry picked from commit 850a7b31de86056fc9223d809dfae54b0e490c5f)
---
modules_k/presence_dialoginfo/pidf.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules_k/presence_dialoginfo/pidf.c b/modules_k/presence_dialoginfo/pidf.c
index 9285d2b..d90de4c 100644
--- a/modules_k/presence_dialoginfo/pidf.c
+++ b/modules_k/presence_dialoginfo/pidf.c
@@ -36,12 +36,12 @@
* use 600 for 'Single UNIX Specification, Version 3'
* _XOPEN_SOURCE creates conflict in header definitions in Solaris
*/
-#ifndef __OS_solaris
- #define _XOPEN_SOURCE 600 /* glibc2 on linux, bsd */
+#ifdef __OS_linux
+ #define _XOPEN_SOURCE 600 /* glibc2 on linux */
#define _BSD_SOURCE 1 /* needed on linux to "fix" the effect
of the above define on
features.h/unistd.h syscall() */
-#else
+#elif defined __OS_solaris
#define _XOPEN_SOURCE_EXTENDED 1 /* solaris */
#endif
More information about the sr-dev
mailing list