OpenBSD portability to H323

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2806 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 166d6b2..18960df 100755 (executable)
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -54,13 +54,13 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <sys/signal.h>
-#include <netinet/ip.h>
 #ifdef __OpenBSD__
 #include <netinet/in_systm.h>
 #ifndef IPTOS_MINCOST
 #define IPTOS_MINCOST 0x02
 #endif
 #endif
+#include <netinet/ip.h>
 
 #include "h323/chan_h323.h"
 

diff --git a/channels/h323/Makefile b/channels/h323/Makefile
index 7bfd712..56cd619 100755 (executable)
--- a/channels/h323/Makefile
+++ b/channels/h323/Makefile
@@ -39,7 +39,10 @@ CFLAGS += -march=$(shell uname -m) -DPBYTE_ORDER=PLITTLE_ENDIAN
 # Pre Janus release directives
 CFLAGS += -DNDEBUG -DDO_CRASH -DDEBUG_THREADS
 CFLAGS += -pipe -Wall -fPIC -Wmissing-prototypes -Wmissing-declarations
-CFLAGS += -DP_LINUX  -D_REENTRANT -D_GNU_SOURCE
+ifeq (${OSARCH},Linux)
+CFLAGS += -DP_LINUX
+endif
+CFLAGS += -D_REENTRANT -D_GNU_SOURCE
 CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS
 CFLAGS += -DPHAS_TEMPLATES -DPTRACING -DP_USE_PRAGMA
 CFLAGS += -I../../include