Fix DynamicLinker Impl: Add Bionic specialization using Bionic's non POSIX values; Using same pattern for Mac OS X.

Add Bionic specialization using Bionic's non POSIX values
 - derive from UnixDynamicLinkerImpl
 - specify own flag and mode values
 - use UnixDynamicLinkerImpl native code

Using same pattern for Mac OS X
 - derive from UnixDynamicLinkerImpl
 - specify own flag and mode values
 - use UnixDynamicLinkerImpl native code
 - drop MacOSXDynamicLinkerImpl native code

1 files changed, 14 insertions, 15 deletions

diff --git a/src/java/jogamp/common/os/UnixDynamicLinkerImpl.java b/src/java/jogamp/common/os/UnixDynamicLinkerImpl.java
index 2258dfa..e4cdbda 100644
--- a/src/java/jogamp/common/os/UnixDynamicLinkerImpl.java
+++ b/src/java/jogamp/common/os/UnixDynamicLinkerImpl.java
@@ -1,5 +1,3 @@
-/* !---- DO NOT EDIT: This file autogenerated by com\sun\gluegen\JavaEmitter.java on Mon Jul 31 16:26:59 PDT 2006 ----! */
-
 package jogamp.common.os;
 
 import com.jogamp.common.os.DynamicLinker;
@@ -8,23 +6,25 @@ import com.jogamp.common.util.SecurityUtil;
 
 public class UnixDynamicLinkerImpl implements DynamicLinker {
 
-  public static final long RTLD_DEFAULT = 0;
-  public static final int RTLD_LAZY     = 0x00001;
-  public static final int RTLD_NOW      = 0x00002;
-  public static final int RTLD_GLOBAL   = 0x00100;
-  public static final int RTLD_LOCAL    = 0x00000;
+  private static final long RTLD_DEFAULT = 0;
+  //      static final long RTLD_NEXT    = -1L;
+  
+  private static final int RTLD_LAZY     = 0x00001;
+  //      static final int RTLD_NOW      = 0x00002;
+  private static final int RTLD_LOCAL    = 0x00000;
+  private static final int RTLD_GLOBAL   = 0x00100;
 
   /** Interface to C language function: <br> <code> int dlclose(void * ); </code>    */
-  private static native int dlclose(long arg0);
+  /* pp */ static native int dlclose(long arg0);
 
   /** Interface to C language function: <br> <code> char *  dlerror(void); </code>    */
-  private static native java.lang.String dlerror();
+  /* pp */ static native java.lang.String dlerror();
 
   /** Interface to C language function: <br> <code> void *  dlopen(const char * , int); </code>    */
-  private static native long dlopen(java.lang.String arg0, int arg1);
+  /* pp */ static native long dlopen(java.lang.String arg0, int arg1);
 
   /** Interface to C language function: <br> <code> void *  dlsym(void * , const char * ); </code>    */
-  private static native long dlsym(long arg0, java.lang.String arg1);
+  /* pp */ static native long dlsym(long arg0, java.lang.String arg1);
 
 
   // --- Begin CustomJavaCode .cfg declarations
@@ -55,7 +55,7 @@ public class UnixDynamicLinkerImpl implements DynamicLinker {
   public long lookupSymbol(long libraryHandle, String symbolName) {
     final long addr = dlsym(libraryHandle, symbolName);
     if(DEBUG_LOOKUP) {
-        System.err.println("UnixDynamicLinkerImpl.lookupSymbol(0x"+Long.toHexString(libraryHandle)+", "+symbolName+") -> 0x"+Long.toHexString(addr));
+        System.err.println("DynamicLinkerImpl.lookupSymbol(0x"+Long.toHexString(libraryHandle)+", "+symbolName+") -> 0x"+Long.toHexString(addr));
     }
     return addr;    
   }
@@ -63,7 +63,7 @@ public class UnixDynamicLinkerImpl implements DynamicLinker {
   public long lookupSymbolGlobal(String symbolName) {
     final long addr = dlsym(RTLD_DEFAULT, symbolName);
     if(DEBUG_LOOKUP) {
-        System.err.println("UnixDynamicLinkerImpl.lookupSymbolGlobal("+symbolName+") -> 0x"+Long.toHexString(addr));
+        System.err.println("DynamicLinkerImpl.lookupSymbolGlobal("+symbolName+") -> 0x"+Long.toHexString(addr));
     }
     return addr;    
   }
@@ -71,6 +71,5 @@ public class UnixDynamicLinkerImpl implements DynamicLinker {
   public void closeLibrary(long libraryHandle) {
     dlclose(libraryHandle);
   }
-  // ---- End CustomJavaCode .cfg declarations
 
-} // end of class UnixDynamicLinkerImpl
+}