[svn-commits] kpfleming: branch 1.6.0 r131924 - in /branches/1.6.0: ./ include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Fri Jul 18 11:16:47 2008
New Revision: 131924

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

................
r131923 | kpfleming | 2008-07-18 11:16:12 -0500 (Fri, 18 Jul 2008) | 10 lines

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:
    branches/1.6.0/include/asterisk/dlfcn-compat.h
    branches/1.6.0/main/dlfcn.c
Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/Makefile
    branches/1.6.0/main/loader.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/Makefile?view=diff&rev=131924&r1=131923&r2=131924
==============================================================================
--- branches/1.6.0/main/Makefile (original)
+++ branches/1.6.0/main/Makefile Fri Jul 18 11:16:47 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: branches/1.6.0/main/loader.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/loader.c?view=diff&rev=131924&r1=131923&r2=131924
==============================================================================
--- branches/1.6.0/main/loader.c (original)
+++ branches/1.6.0/main/loader.c Fri Jul 18 11:16:47 2008
@@ -48,11 +48,7 @@
 #include "asterisk/lock.h"
 #include "asterisk/features.h"
 
-#ifdef DLFCNCOMPAT
-#include "asterisk/dlfcn-compat.h"
-#else
 #include <dlfcn.h>
-#endif
 
 #include "asterisk/md5.h"
 #include "asterisk/utils.h"