summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorDavid Troy <dave@popvox.com>2006-06-19 09:16:45 +0000
committerDavid Troy <dave@popvox.com>2006-06-19 09:16:45 +0000
commit933875c14b2c937bcec409231e3467ecc602032b (patch)
tree8c5cc3936a1bc8e6a58c3bf64402cdcf7dd60539 /src/include
parent65b1273dabf6f8129ebca43bfefb4ec07adcaddc (diff)
downloadastmanproxy-933875c14b2c937bcec409231e3467ecc602032b.tar.gz
astmanproxy-933875c14b2c937bcec409231e3467ecc602032b.tar.xz
astmanproxy-933875c14b2c937bcec409231e3467ecc602032b.zip
Resolved 1.21pre merge conflicts
git-svn-id: http://svncommunity.digium.com/svn/astmanproxy/trunk@125 f02b47b9-160a-0410-81a6-dc3441afb0ec
Diffstat (limited to 'src/include')
-rw-r--r--src/include/astmanproxy.h3
1 files changed, 1 insertions, 2 deletions
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