From 933875c14b2c937bcec409231e3467ecc602032b Mon Sep 17 00:00:00 2001
From: David Troy <dave@popvox.com>
Date: Mon, 19 Jun 2006 09:16:45 +0000
Subject: Resolved 1.21pre merge conflicts

git-svn-id: http://svncommunity.digium.com/svn/astmanproxy/trunk@125 f02b47b9-160a-0410-81a6-dc3441afb0ec
---
 src/include/astmanproxy.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/include')

diff --git a/src/include/astmanproxy.h b/src/include/astmanproxy.h
index dc7ac87..9d8ed89 100644
--- a/src/include/astmanproxy.h
+++ b/src/include/astmanproxy.h
@@ -17,11 +17,10 @@
 #include <stdarg.h>
 #include <dirent.h>
 #include <errno.h>
+#include <dlfcn.h>
 #ifdef __APPLE__
-    #include "dlfcn-compat.h"
     #include "poll-compat.h"
 #else
-    #include <dlfcn.h>
     #include <sys/poll.h>
 #endif
 
-- 
cgit