[Openmcl-cvs-notifications] r10596 - in /trunk/source/lisp-kernel: Threads.h m4macros.m4 win32/Makefile win64/Makefile windows-calls.c x86-asmutils32.s

[gb at clozure.com]

Author: gb
Date: Sun Aug 31 07:56:25 2008
New Revision: 10596

Log:
<ole2.h> #defines WIN32, even on 64-bit platforms.
Have the Makefiles define WIN_32/WIN_64, which don't seem to be #defined
in any header files.

Modified:
    trunk/source/lisp-kernel/Threads.h
    trunk/source/lisp-kernel/m4macros.m4
    trunk/source/lisp-kernel/win32/Makefile
    trunk/source/lisp-kernel/win64/Makefile
    trunk/source/lisp-kernel/windows-calls.c
    trunk/source/lisp-kernel/x86-asmutils32.s

Modified: trunk/source/lisp-kernel/Threads.h
=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/Threads.h (original)
+++ trunk/source/lisp-kernel/Threads.h Sun Aug 31 07:56:25 2008
@@ -45,7 +45,7 @@
 #ifdef WINDOWS
 #define USE_WINDOWS_SEMAPHORES 1
 #undef USE_POSIX_SEMAPHORES
-#ifdef WIN32
+#ifdef WIN_32
 struct timespec {
   int tv_sec;
   int tv_nsec;

Modified: trunk/source/lisp-kernel/m4macros.m4
=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/m4macros.m4 (original)
+++ trunk/source/lisp-kernel/m4macros.m4 Sun Aug 31 07:56:25 2008
@@ -322,10 +322,10 @@
 equate_if_defined([LINUX])
 equate_if_defined([FREEBSD])
 equate_if_defined([SOLARIS])
-equate_if_defined([WIN64])
+equate_if_defined([WIN_64])
 equate_if_defined([PPC64])
 equate_if_defined([X8664])
-equate_if_defined([WIN32])
+equate_if_defined([WIN_32])
 equate_if_defined([WINDOWS])
 =

 equate_if_defined([HAVE_TLS])

Modified: trunk/source/lisp-kernel/win32/Makefile
=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/win32/Makefile (original)
+++ trunk/source/lisp-kernel/win32/Makefile Sun Aug 31 07:56:25 2008
@@ -21,8 +21,8 @@
 M4 =3D m4
 LD =3D ld
 ASFLAGS =3D -g --32
-M4FLAGS =3D -DWIN32 -DWINDOWS -DX86 -DX8632
-CDEFINES =3D -DWIN32 -DWINDOWS -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE  -=
D__MSVCRT__ -D__MSVCRT_VERSION__=3D0x700 -D_WIN32_WINNT=3D0x0502
+M4FLAGS =3D -DWIN_32 -DWINDOWS -DX86 -DX8632
+CDEFINES =3D -DWIN_32 -DWINDOWS -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE  =
-D__MSVCRT__ -D__MSVCRT_VERSION__=3D0x700 -D_WIN32_WINNT=3D0x0502
 CDEBUG =3D -g
 COPT =3D #-O2
 =


Modified: trunk/source/lisp-kernel/win64/Makefile
=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/win64/Makefile (original)
+++ trunk/source/lisp-kernel/win64/Makefile Sun Aug 31 07:56:25 2008
@@ -23,8 +23,8 @@
 M4 =3D m4
 LD =3D x86_64-pc-mingw32-ld
 ASFLAGS =3D -g --64
-M4FLAGS =3D -DWIN64 -DWINDOWS -DX86 -DX8664 -DHAVE_TLS -DEMUTLS
-CDEFINES =3D -DWIN64 -DWINDOWS -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -D=
HAVE_TLS -DEMUTLS
+M4FLAGS =3D -DWIN_64 -DWINDOWS -DX86 -DX8664 -DHAVE_TLS -DEMUTLS
+CDEFINES =3D -DWIN_64 -DWINDOWS -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -=
DHAVE_TLS -DEMUTLS
 CDEBUG =3D -g
 COPT =3D -O2
 =


Modified: trunk/source/lisp-kernel/windows-calls.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/windows-calls.c (original)
+++ trunk/source/lisp-kernel/windows-calls.c Sun Aug 31 07:56:25 2008
@@ -44,7 +44,7 @@
 #include <stdio.h>
 =

 =

-#ifndef WIN32
+#ifndef WIN_32
 #define _dosmaperr mingw_dosmaperr
 #else
 void

Modified: trunk/source/lisp-kernel/x86-asmutils32.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
--- trunk/source/lisp-kernel/x86-asmutils32.s (original)
+++ trunk/source/lisp-kernel/x86-asmutils32.s Sun Aug 31 07:56:25 2008
@@ -167,7 +167,7 @@
 	__(ret)
 _endfn				=

 =

-        __ifdef([WIN32])
+        __ifdef([WIN_32])
 _exportfn(C(restore_windows_context))
 Xrestore_windows_context_start:
         __(hlt)