Skip to content

Commit

Permalink
modules/presence_conference: re-organize preprocessor symbols
Browse files Browse the repository at this point in the history
Fixes compilation on FreeBSD where no special feature request is needed

(cherry picked from commit 9852f75)
  • Loading branch information
mslehto authored and miconda committed Jun 27, 2016
1 parent 01698f4 commit 82b2452
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions modules/presence_conference/pidf.c
Expand Up @@ -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>
Expand Down

0 comments on commit 82b2452

Please sign in to comment.