src/java.base/share/native/launcher/defines.h

rev 17323 : [mq]: 8180334-00.patch

*** 1,7 ****
  /*
!  * Copyright (c) 2005, 2016, 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) 2005, 2017, 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
*** 42,62 ****
  
  /* Unused, but retained for JLI_Launch compatibility*/
  #define DOT_VERSION "0.0"
  
  #ifdef JAVA_ARGS
- #define HAS_JAVA_ARGS JNI_TRUE
  #ifdef PROGNAME
  static const char* const_progname = PROGNAME;
  #else
  static char* const_progname = NULL;
  #endif
  static const char* const_jargs[] = JAVA_ARGS;
  #else  /* !JAVA_ARGS */
- #define HAS_JAVA_ARGS JNI_FALSE
  static const char* const_progname = "java";
  static const char** const_jargs = NULL;
  static const char* const_appclasspath[] = { NULL };
  #endif /* JAVA_ARGS */
  
  #ifdef LAUNCHER_NAME
  static const char* const_launcher = LAUNCHER_NAME;
--- 42,66 ----
  
  /* Unused, but retained for JLI_Launch compatibility*/
  #define DOT_VERSION "0.0"
  
  #ifdef JAVA_ARGS
  #ifdef PROGNAME
  static const char* const_progname = PROGNAME;
  #else
  static char* const_progname = NULL;
  #endif
  static const char* const_jargs[] = JAVA_ARGS;
+ #ifdef EXTRA_JAVA_ARGS
+ static const char* const_extra_jargs[] = EXTRA_JAVA_ARGS;
+ #else
+ static const char** const_extra_jargs = NULL;
+ #endif
  #else  /* !JAVA_ARGS */
  static const char* const_progname = "java";
  static const char** const_jargs = NULL;
+ static const char** const_extra_jargs = NULL;
  static const char* const_appclasspath[] = { NULL };
  #endif /* JAVA_ARGS */
  
  #ifdef LAUNCHER_NAME
  static const char* const_launcher = LAUNCHER_NAME;