[Openmcl-cvs-notifications] r11697 - in /release/1.3/source/lisp-kernel: pmcl-kernel.c x86-asmutils64.s

[rme at clozure.com]

Author: rme
Date: Sun Feb  8 07:07:27 2009
New Revision: 11697

Log:
Merge r11694-r11696 from trunk.

Modified:
    release/1.3/source/lisp-kernel/pmcl-kernel.c
    release/1.3/source/lisp-kernel/x86-asmutils64.s

Modified: release/1.3/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
--- release/1.3/source/lisp-kernel/pmcl-kernel.c (original)
+++ release/1.3/source/lisp-kernel/pmcl-kernel.c Sun Feb  8 07:07:27 2009
@@ -1508,20 +1508,21 @@
   BytePtr stack_base, current_sp =3D (BytePtr) current_stack_pointer();
   TCR *tcr;
 =

+  dbgout =3D stderr;
 =

 #ifdef WINDOWS
-  extern void init_winsock(void);
-  extern void init_windows_io(void);
-
-  _fmode =3D O_BINARY;
-  _setmode(1, O_BINARY);
-  _setmode(2, O_BINARY);
-  setvbuf(dbgout, NULL, _IONBF, 0);
-  init_winsock();
-  init_windows_io();
-#endif
-
-  dbgout =3D stderr;
+  {
+    extern void init_winsock(void);
+    extern void init_windows_io(void);
+
+    _fmode =3D O_BINARY;
+    _setmode(1, O_BINARY);
+    _setmode(2, O_BINARY);
+    setvbuf(dbgout, NULL, _IONBF, 0);
+    init_winsock();
+    init_windows_io();
+  }
+#endif
 =

   check_os_version(argv[0]);
   real_executable_name =3D determine_executable_name(argv[0]);

Modified: release/1.3/source/lisp-kernel/x86-asmutils64.s
=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
--- release/1.3/source/lisp-kernel/x86-asmutils64.s (original)
+++ release/1.3/source/lisp-kernel/x86-asmutils64.s Sun Feb  8 07:07:27 2009
@@ -169,6 +169,7 @@
 _exportfn(C(get_vector_registers))
 _endfn
 =

+	__ifdef([DARWIN])
 _exportfn(C(darwin_sigreturn))
         .globl C(sigreturn)
 /* Need to set the sigreturn 'infostyle' argument, which is mostly
@@ -177,7 +178,8 @@
    to it ... */
         __(movl $0x1e,%esi)
         __(jmp C(sigreturn))
-_endfn            =

+_endfn
+	__endif
 =

 _exportfn(C(put_vector_registers))
 _endfn				=