[Openmcl-cvs-notifications] r14953 - /trunk/source/lisp-kernel/pmcl-kernel.c

[gb at clozure.com]

Author: gb
Date: Wed Aug 24 11:26:58 2011
New Revision: 14953

Log:
revert last change

Modified:
    trunk/source/lisp-kernel/pmcl-kernel.c

Modified: trunk/source/lisp-kernel/pmcl-kernel.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/pmcl-kernel.c (original)
+++ trunk/source/lisp-kernel/pmcl-kernel.c Wed Aug 24 11:26:58 2011
@@ -1895,36 +1895,31 @@
 #endif
   tcr_area_lock =3D (void *)new_recursive_lock();
 =

-  if (check_for_embedded_image(real_executable_name)) {
-    image_name =3D real_executable_name;
-  }
-
   program_name =3D argv[0];
-
-  if ( image_name =3D=3D NULL ) {
-    if ((argc =3D=3D 2) && (*argv[1] !=3D '-')) {
-#ifdef WINDOWS
-      image_name =3D utf_16_argv[1];
-#else
-      image_name =3D argv[1];
-#endif
-      argv[1] =3D NULL;
-#ifdef WINDOWS
-      utf_16_argv[1] =3D NULL;
-#endif
-    } else {
-      process_options(argc,argv,utf_16_argv);
-    }
-  }
-
+  if ((argc =3D=3D 2) && (*argv[1] !=3D '-')) {
+#ifdef WINDOWS
+    image_name =3D utf_16_argv[1];
+#else
+    image_name =3D argv[1];
+#endif
+    argv[1] =3D NULL;
+#ifdef WINDOWS
+    utf_16_argv[1] =3D NULL;
+#endif
+  } else {
+    process_options(argc,argv,utf_16_argv);
+  }
   if (lisp_heap_gc_threshold !=3D DEFAULT_LISP_HEAP_GC_THRESHOLD) {
     lisp_heap_threshold_set_from_command_line =3D true;
   }
 =

   initial_stack_size =3D ensure_stack_limit(initial_stack_size);
-  =

   if (image_name =3D=3D NULL) {
-    image_name =3D default_image_name(real_executable_name);
+    if (check_for_embedded_image(real_executable_name)) {
+      image_name =3D real_executable_name;
+    } else {
+      image_name =3D default_image_name(real_executable_name);
+    }
   }
 =

   while (1) {