Changeset 5517:287ced72ce95 in roaraudio
- Timestamp:
- 06/01/12 10:59:15 (11 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
r5513 r5517 6 6 * Added a way to register plugin parts with a universal API (Closes: #245) 7 7 * Updated debian init script (Closes: #183) 8 * Fixed detection of dynamic loader on *BSD. 8 9 9 10 v. 1.0beta1 - Sat May 12 2012 11:49 CEST -
configure
r5493 r5517 1656 1656 test_lib_defmake ROAR_HAVE_H_WINSOCK % winsock.h c -- winsock.h 1657 1657 test_lib_defmake ROAR_HAVE_H_WINSOCK2 % winsock2.h c -- winsock2.h 1658 test_lib_defmake ROAR_HAVE_H_DLFCN % dlfcn.h c -- dlfcn.h 1658 1659 MINIMAL=$OLD_MINIMAL 1659 1660 -
include/libroar/libroar.h
r5505 r5517 104 104 #endif 105 105 106 #if defined(ROAR_HAVE_ LIBDL)106 #if defined(ROAR_HAVE_H_DLFCN) 107 107 #include <dlfcn.h> 108 108 #endif -
libroar/roardl.c
r5514 r5517 40 40 #endif 41 41 42 #if defined(ROAR_HAVE_ LIBDL) && !defined(RTLD_NEXT)42 #if defined(ROAR_HAVE_H_DLFCN) && !defined(RTLD_NEXT) 43 43 #define RTLD_NEXT ((void *) -1L) 44 44 #endif … … 61 61 } context; 62 62 unsigned int runtime_flags; 63 #if defined(ROAR_HAVE_ LIBDL)63 #if defined(ROAR_HAVE_H_DLFCN) 64 64 void * handle; 65 65 #elif defined(ROAR_TARGET_WIN32) … … 192 192 193 193 194 #if defined(ROAR_HAVE_ LIBDL)194 #if defined(ROAR_HAVE_H_DLFCN) 195 195 static void * _roardl2ldl (struct roar_dl_lhandle * lhandle) { 196 196 ROAR_DBG("_roardl2ldl(lhandle=%p) = ?", lhandle); … … 354 354 int ra_init, struct roar_dl_librarypara * para) { 355 355 struct roar_dl_lhandle * ret = NULL; 356 #if defined(ROAR_HAVE_ LIBDL)356 #if defined(ROAR_HAVE_H_DLFCN) 357 357 #ifdef RTLD_DEEPBIND 358 358 int libdl_flags = RTLD_DEEPBIND; … … 371 371 return _roar_dl_open_pluginpath(filename, flags, ra_init, para); 372 372 373 #if defined(ROAR_HAVE_ LIBDL)373 #if defined(ROAR_HAVE_H_DLFCN) 374 374 if ( flags & ROAR_DL_FLAG_LAZY ) { 375 375 libdl_flags |= RTLD_LAZY; … … 396 396 } 397 397 } else { 398 #if defined(ROAR_HAVE_ LIBDL)398 #if defined(ROAR_HAVE_H_DLFCN) 399 399 ret->handle = dlopen(filename, libdl_flags); 400 400 … … 424 424 err = roar_error; 425 425 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)); 426 #if defined(ROAR_HAVE_ LIBDL)426 #if defined(ROAR_HAVE_H_DLFCN) 427 427 if ( ret->handle != NULL ) 428 428 dlclose(ret->handle); … … 480 480 } 481 481 482 #if defined(ROAR_HAVE_ LIBDL)482 #if defined(ROAR_HAVE_H_DLFCN) 483 483 if ( lhandle->handle == NULL ) { 484 484 ret = 0; … … 516 516 517 517 void * roar_dl_getsym(struct roar_dl_lhandle * lhandle, const char * sym, int type) { 518 #if defined(ROAR_HAVE_ LIBDL)518 #if defined(ROAR_HAVE_H_DLFCN) 519 519 void * ret = dlsym(_roardl2ldl(lhandle), sym); 520 520 … … 664 664 665 665 const char * roar_dl_errstr(struct roar_dl_lhandle * lhandle) { 666 #if defined(ROAR_HAVE_ LIBDL)666 #if defined(ROAR_HAVE_H_DLFCN) 667 667 (void)lhandle; 668 668 return dlerror(); -
roarclients/roarpluginrunner.c
r5484 r5517 82 82 83 83 static const char * _ptr2str(const void * p) { 84 #if defined(ROAR_HAVE_ LIBDL) && defined(ROAR_HAVE_DLADDR)84 #if defined(ROAR_HAVE_H_DLFCN) && defined(ROAR_HAVE_DLADDR) 85 85 static char buf[80]; 86 86 Dl_info info; … … 92 92 return "<not set>"; 93 93 94 #if defined(ROAR_HAVE_ LIBDL) && defined(ROAR_HAVE_DLADDR)94 #if defined(ROAR_HAVE_H_DLFCN) && defined(ROAR_HAVE_DLADDR) 95 95 if ( dladdr(p, &info) != 0 ) { 96 96 if ( p == info.dli_saddr ) {
Note: See TracChangeset
for help on using the changeset viewer.