src/java.base/share/native/launcher/main.c

*** 81,101 ****
  char **__initenv;
  
  int WINAPI
  WinMain(HINSTANCE inst, HINSTANCE previnst, LPSTR cmdline, int cmdshow)
  {
!     int margc, appclassc;
      char** margv;
      const jboolean const_javaw = JNI_TRUE;
  
      __initenv = _environ;
  
  #else /* JAVAW */
  int
  main(int argc, char **argv)
  {
!     int margc, appclassc;
      char** margv;
      const jboolean const_javaw = JNI_FALSE;
  #endif /* JAVAW */
  
      JLI_InitArgProcessing(!HAS_JAVA_ARGS, const_disable_argfile);
--- 81,101 ----
  char **__initenv;
  
  int WINAPI
  WinMain(HINSTANCE inst, HINSTANCE previnst, LPSTR cmdline, int cmdshow)
  {
!     int margc;
      char** margv;
      const jboolean const_javaw = JNI_TRUE;
  
      __initenv = _environ;
  
  #else /* JAVAW */
  int
  main(int argc, char **argv)
  {
!     int margc;
      char** margv;
      const jboolean const_javaw = JNI_FALSE;
  #endif /* JAVAW */
  
      JLI_InitArgProcessing(!HAS_JAVA_ARGS, const_disable_argfile);
*** 146,163 ****
          // add the NULL pointer at argv[argc]
          JLI_List_add(args, NULL);
          margv = args->elements;
      }
  #endif /* WIN32 */
-     if (const_appclasspath[0] == NULL) {
-         appclassc = 0;
-     } else {
-         appclassc = sizeof(const_appclasspath) / sizeof(char *);
-     }
      return JLI_Launch(margc, margv,
                     sizeof(const_jargs) / sizeof(char *), const_jargs,
!                    appclassc, const_appclasspath,
                     VERSION_STRING,
                     DOT_VERSION,
                     (const_progname != NULL) ? const_progname : *margv,
                     (const_launcher != NULL) ? const_launcher : *margv,
                     HAS_JAVA_ARGS,
--- 146,158 ----
          // add the NULL pointer at argv[argc]
          JLI_List_add(args, NULL);
          margv = args->elements;
      }
  #endif /* WIN32 */
      return JLI_Launch(margc, margv,
                     sizeof(const_jargs) / sizeof(char *), const_jargs,
!                    0, NULL,
                     VERSION_STRING,
                     DOT_VERSION,
                     (const_progname != NULL) ? const_progname : *margv,
                     (const_launcher != NULL) ? const_launcher : *margv,
                     HAS_JAVA_ARGS,