src/solaris/bin/java_md_solinux.h

rev 8822 : 8024854: PPC64: Basic changes and files to build the class library on AIX
Reviewed-by: alanb, prr, sla, chegar, michaelm, mullan, art
Contributed-by: luchsh@linux.vnet.ibm.com, spoole@linux.vnet.ibm.com, thomas.stuefe@sap.com

*** 1,7 ****
  /*
!  * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 43,67 ****
  
  /*
   *      A collection of useful strings. One should think of these as #define
   *      entries, but actual strings can be more efficient (with many compilers).
   */
! #ifdef __linux__
! static const char *system_dir   = "/usr/java";
! static const char *user_dir     = "/java";
! #else /* Solaris */
  static const char *system_dir   = "/usr/jdk";
  static const char *user_dir     = "/jdk";
  #endif
  
  #include <dlfcn.h>
! #ifdef __linux__
! #include <pthread.h>
! #else
  #include <thread.h>
  #endif
  
- #define JVM_DLL         "libjvm.so"
- #define JAVA_DLL        "libjava.so"
- #define LD_LIBRARY_PATH "LD_LIBRARY_PATH"
- 
  #endif /* JAVA_MD_SOLINUX_H */
--- 43,63 ----
  
  /*
   *      A collection of useful strings. One should think of these as #define
   *      entries, but actual strings can be more efficient (with many compilers).
   */
! #ifdef __solaris__
  static const char *system_dir   = "/usr/jdk";
  static const char *user_dir     = "/jdk";
+ #else /* !__solaris__, i.e. Linux, AIX,.. */
+ static const char *system_dir   = "/usr/java";
+ static const char *user_dir     = "/java";
  #endif
  
  #include <dlfcn.h>
! #ifdef __solaris__
  #include <thread.h>
+ #else
+ #include <pthread.h>
  #endif
  
  #endif /* JAVA_MD_SOLINUX_H */