Changeset 5517:287ced72ce95 in roaraudio

Timestamp:

06/01/12 10:59:15 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Fixed detection of dynamic loader on *BSD.

Files:

• ChangeLog (modified) (1 diff)
• configure (modified) (1 diff)
• include/libroar/libroar.h (modified) (1 diff)
• libroar/roardl.c (modified) (10 diffs)
• roarclients/roarpluginrunner.c (modified) (2 diffs)

ChangeLog

@@ -6 +6 @@
         * Added a way to register plugin parts with a universal API (Closes: #245)
         * Updated debian init script (Closes: #183)
+        * Fixed detection of dynamic loader on *BSD.
 
 v. 1.0beta1 - Sat May 12 2012 11:49 CEST

configure

@@ -1656 +1656 @@
 test_lib_defmake ROAR_HAVE_H_WINSOCK     %            winsock.h     c          -- winsock.h
 test_lib_defmake ROAR_HAVE_H_WINSOCK2    %            winsock2.h    c          -- winsock2.h
+test_lib_defmake ROAR_HAVE_H_DLFCN       %            dlfcn.h       c          -- dlfcn.h
 MINIMAL=$OLD_MINIMAL
 

include/libroar/libroar.h

@@ -104 +104 @@
 #endif
 
-#if defined(ROAR_HAVE_LIBDL)
+#if defined(ROAR_HAVE_H_DLFCN)
 #include <dlfcn.h>
 #endif

libroar/roardl.c

@@ -40 +40 @@
 #endif
 
-#if defined(ROAR_HAVE_LIBDL) && !defined(RTLD_NEXT)
+#if defined(ROAR_HAVE_H_DLFCN) && !defined(RTLD_NEXT)
 #define RTLD_NEXT ((void *) -1L)
 #endif
@@ -61 +61 @@
  } context;
  unsigned int runtime_flags;
-#if defined(ROAR_HAVE_LIBDL)
+#if defined(ROAR_HAVE_H_DLFCN)
  void * handle;
 #elif defined(ROAR_TARGET_WIN32)
@@ -192 +192 @@
 
 
-#if defined(ROAR_HAVE_LIBDL)
+#if defined(ROAR_HAVE_H_DLFCN)
 static void * _roardl2ldl (struct roar_dl_lhandle * lhandle) {
  ROAR_DBG("_roardl2ldl(lhandle=%p) = ?", lhandle);
@@ -354 +354 @@
                                       int ra_init, struct roar_dl_librarypara * para) {
  struct roar_dl_lhandle * ret = NULL;
-#if defined(ROAR_HAVE_LIBDL)
+#if defined(ROAR_HAVE_H_DLFCN)
 #ifdef RTLD_DEEPBIND
  int libdl_flags = RTLD_DEEPBIND;
@@ -371 +371 @@
   return _roar_dl_open_pluginpath(filename, flags, ra_init, para);
 
-#if defined(ROAR_HAVE_LIBDL)
+#if defined(ROAR_HAVE_H_DLFCN)
  if ( flags & ROAR_DL_FLAG_LAZY ) {
   libdl_flags |= RTLD_LAZY;
@@ -396 +396 @@
   }
  } else {
-#if defined(ROAR_HAVE_LIBDL)
+#if defined(ROAR_HAVE_H_DLFCN)
   ret->handle = dlopen(filename, libdl_flags);
 
@@ -424 +424 @@
    err = roar_error;
    ROAR_WARN("roar_dl_open(filename='%s', flags=%i, ra_init=%i, para=%p): Can not init RA lib: %s", filename, flags, ra_init, para, roar_error2str(err));
-#if defined(ROAR_HAVE_LIBDL)
+#if defined(ROAR_HAVE_H_DLFCN)
    if ( ret->handle != NULL )
     dlclose(ret->handle);
@@ -480 +480 @@
  }
 
-#if defined(ROAR_HAVE_LIBDL)
+#if defined(ROAR_HAVE_H_DLFCN)
  if ( lhandle->handle == NULL ) {
   ret = 0;
@@ -516 +516 @@
 
 void                   * roar_dl_getsym(struct roar_dl_lhandle * lhandle, const char * sym, int type) {
-#if defined(ROAR_HAVE_LIBDL)
+#if defined(ROAR_HAVE_H_DLFCN)
  void * ret = dlsym(_roardl2ldl(lhandle), sym);
 
@@ -664 +664 @@
 
 const char * roar_dl_errstr(struct roar_dl_lhandle * lhandle) {
-#if defined(ROAR_HAVE_LIBDL)
+#if defined(ROAR_HAVE_H_DLFCN)
  (void)lhandle;
  return dlerror();

roarclients/roarpluginrunner.c

@@ -82 +82 @@
 
 static const char * _ptr2str(const void * p) {
-#if defined(ROAR_HAVE_LIBDL) && defined(ROAR_HAVE_DLADDR)
+#if defined(ROAR_HAVE_H_DLFCN) && defined(ROAR_HAVE_DLADDR)
  static char buf[80];
  Dl_info info;
@@ -92 +92 @@
   return "<not set>";
 
-#if defined(ROAR_HAVE_LIBDL) && defined(ROAR_HAVE_DLADDR)
+#if defined(ROAR_HAVE_H_DLFCN) && defined(ROAR_HAVE_DLADDR)
  if ( dladdr(p, &info) != 0 ) {
   if ( p == info.dli_saddr ) {