[svn-commits] kpfleming: trunk r131923 - in /trunk: ./ include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Fri Jul 18 11:16:12 2008
New Revision: 131923

URL: http://svn.digium.com/view/asterisk?view=rev&rev=131923
Log:
Merged revisions 131921 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r131921 | kpfleming | 2008-07-18 11:15:41 -0500 (Fri, 18 Jul 2008) | 2 lines

remove the dlfcn compatibility stuff, because no platforms that Asterisk currently runs on it use it, and it doesn't build anyway

........

Removed:
    trunk/include/asterisk/dlfcn-compat.h
    trunk/main/dlfcn.c
Modified:
    trunk/   (props changed)
    trunk/main/Makefile
    trunk/main/loader.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/main/Makefile?view=diff&rev=131923&r1=131922&r2=131923
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Fri Jul 18 11:16:12 2008
@@ -46,10 +46,6 @@
 
 ifeq ($(POLL_AVAILABLE),)
   OBJS+=poll.o
-endif
-
-ifeq ($(wildcard /usr/include/dlfcn.h),)
-  OBJS+=dlfcn.o
 endif
 
 ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-gnueabi ),)

Modified: trunk/main/loader.c
URL: http://svn.digium.com/view/asterisk/trunk/main/loader.c?view=diff&rev=131923&r1=131922&r2=131923
==============================================================================
--- trunk/main/loader.c (original)
+++ trunk/main/loader.c Fri Jul 18 11:16:12 2008
@@ -50,11 +50,7 @@
 #include "asterisk/dsp.h"
 #include "asterisk/udptl.h"
 
-#ifdef DLFCNCOMPAT
-#include "asterisk/dlfcn-compat.h"
-#else
 #include <dlfcn.h>
-#endif
 
 #include "asterisk/md5.h"
 #include "asterisk/utils.h"