Index: libcfa/src/interpose.cfa
===================================================================
--- libcfa/src/interpose.cfa	(revision 3494ca9d8921c3db5e147de46abe94fce8e843e6)
+++ libcfa/src/interpose.cfa	(revision 640b3dfd1727995c187f28aa3bdbaab51fc5e93b)
@@ -10,6 +10,6 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan  9 08:44:03 2023
-// Update Count     : 182
+// Last Modified On : Sun Feb 19 17:09:16 2023
+// Update Count     : 183
 //
 
@@ -45,14 +45,5 @@
 	union { generic_fptr_t fptr; void * ptr; } originalFunc;
 
-	#if defined( _GNU_SOURCE )
-		if ( version ) {
-			originalFunc.ptr = dlvsym( library, symbol, version );
-		} else {
-			originalFunc.ptr = dlsym( library, symbol );
-		}
-	#else
-		originalFunc.ptr = dlsym( library, symbol );
-	#endif // _GNU_SOURCE
-
+	originalFunc.ptr = dlsym( library, symbol );
 	error = dlerror();
 	if ( error ) abort( "interpose_symbol : internal error, %s\n", error );
@@ -66,26 +57,16 @@
 
 	if ( ! library ) {
-		#if defined( RTLD_NEXT )
-			library = RTLD_NEXT;
-		#else
-			// missing RTLD_NEXT => must hard-code library name, assuming libstdc++
-			library = dlopen( "libc.so.6", RTLD_LAZY );
-			const char * error = dlerror();
-			if ( error ) {
-				abort( "interpose_symbol : failed to open libc, %s\n", error );
-			}
-		#endif
+		library = dlopen( "libc.so.6", RTLD_LAZY );
+		const char * error = dlerror();
+		if ( error ) {
+			abort( "interpose_symbol : failed to open libc, %s\n", error );
+		} // if
 	} // if
 	if ( ! pthread_library ) {
-		#if defined( RTLD_NEXT )
-			pthread_library = RTLD_NEXT;
-		#else
-			// missing RTLD_NEXT => must hard-code library name, assuming libstdc++
-			pthread_library = dlopen( "libpthread.so", RTLD_LAZY );
-			const char * error = dlerror();
-			if ( error ) {
-				abort( "interpose_symbol : failed to open libpthread, %s\n", error );
-			}
-		#endif
+		pthread_library = dlopen( "libpthread.so", RTLD_LAZY );
+		const char * error = dlerror();
+		if ( error ) {
+			abort( "interpose_symbol : failed to open libpthread, %s\n", error );
+		} // if
 	} // if
 
Index: libcfa/src/interpose_thread.cfa
===================================================================
--- libcfa/src/interpose_thread.cfa	(revision 3494ca9d8921c3db5e147de46abe94fce8e843e6)
+++ libcfa/src/interpose_thread.cfa	(revision 640b3dfd1727995c187f28aa3bdbaab51fc5e93b)
@@ -41,14 +41,9 @@
 	static void * library;
 	if ( ! library ) {
-		#if defined( RTLD_NEXT )
-			library = RTLD_NEXT;
-		#else
-			// missing RTLD_NEXT => must hard-code library name, assuming libstdc++
-			library = dlopen( "libpthread.so", RTLD_LAZY );
-			const char * error = dlerror();
-			if ( error ) {
-				abort( "interpose_symbol : failed to open libpthread, %s\n", error );
-			}
-		#endif
+		library = dlopen( "libpthread.so", RTLD_LAZY );
+		const char * error = dlerror();
+		if ( error ) {
+			abort( "interpose_symbol : failed to open libpthread, %s\n", error );
+		}
 	} // if