[svn-commits] kpfleming: branch 1.4 r131921 - in /branches/1.4: include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Fri Jul 18 11:15:41 2008
New Revision: 131921

URL: http://svn.digium.com/view/asterisk?view=rev&rev=131921
Log:
remove the dlfcn compatibility stuff, because no platforms that Asterisk currently runs on it use it, and it doesn't build anyway

Removed:
    branches/1.4/include/asterisk/dlfcn-compat.h
    branches/1.4/main/dlfcn.c
Modified:
    branches/1.4/main/Makefile
    branches/1.4/main/loader.c

Modified: branches/1.4/main/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/Makefile?view=diff&rev=131921&r1=131920&r2=131921
==============================================================================
--- branches/1.4/main/Makefile (original)
+++ branches/1.4/main/Makefile Fri Jul 18 11:15:41 2008
@@ -46,10 +46,6 @@
     OBJS+=poll.o
     ASTCFLAGS+=-DPOLLCOMPAT
   endif
-endif
-
-ifeq ($(wildcard /usr/include/dlfcn.h),)
-  OBJS+=dlfcn.o
 endif
 
 ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-gnueabi ),)

Modified: branches/1.4/main/loader.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/loader.c?view=diff&rev=131921&r1=131920&r2=131921
==============================================================================
--- branches/1.4/main/loader.c (original)
+++ branches/1.4/main/loader.c Fri Jul 18 11:15:41 2008
@@ -52,11 +52,7 @@
 #include "asterisk/http.h"
 #include "asterisk/lock.h"
 
-#ifdef DLFCNCOMPAT
-#include "asterisk/dlfcn-compat.h"
-#else
 #include <dlfcn.h>
-#endif
 
 #include "asterisk/md5.h"
 #include "asterisk/utils.h"