[sr-dev] git:master:cae3953c: Merge pull request #632 from mslehto/SUS

Module: kamailio Branch: master Commit: cae3953c574de838f335e8ce08d5bdfb173a7f21 URL: https://github.com/kamailio/kamailio/commit/cae3953c574de838f335e8ce08d5bdf… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2016-05-23T11:23:35+02:00 Merge pull request #632 from mslehto/SUS modules/presence_conference: Fix compilation on FreeBSD --- Modified: modules/presence_conference/pidf.c --- Diff: https://github.com/kamailio/kamailio/commit/cae3953c574de838f335e8ce08d5bdf… Patch: https://github.com/kamailio/kamailio/commit/cae3953c574de838f335e8ce08d5bdf… --- diff --git a/modules/presence_conference/pidf.c b/modules/presence_conference/pidf.c index 1f64e14..f33943f 100644 --- a/modules/presence_conference/pidf.c +++ b/modules/presence_conference/pidf.c @@ -34,24 +34,22 @@ /** * make strptime available * 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() */ #define _DEFAULT_SOURCE 1 /* _BSD_SOURCE is deprecated */ +#endif +#ifdef __OS_darwin #define _DARWIN_C_SOURCE 1 -#else - #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif - +#ifdef __OS_solaris + #define _XOPEN_SOURCE_EXTENDED 1 +#endif #include <time.h> -#undef _XOPEN_SOURCE -#undef _XOPEN_SOURCE_EXTENDED - #include <string.h> #include <stdlib.h> #include <libxml/parser.h>