Changeset 10596


Ignore:
Timestamp:
Aug 31, 2008, 11:56:25 AM (11 years ago)
Author:
gb
Message:

<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.

Location:
trunk/source/lisp-kernel
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/lisp-kernel/Threads.h

    r10592 r10596  
    4646#define USE_WINDOWS_SEMAPHORES 1
    4747#undef USE_POSIX_SEMAPHORES
    48 #ifdef WIN32
     48#ifdef WIN_32
    4949struct timespec {
    5050  int tv_sec;
  • trunk/source/lisp-kernel/m4macros.m4

    r10591 r10596  
    323323equate_if_defined([FREEBSD])
    324324equate_if_defined([SOLARIS])
    325 equate_if_defined([WIN64])
     325equate_if_defined([WIN_64])
    326326equate_if_defined([PPC64])
    327327equate_if_defined([X8664])
    328 equate_if_defined([WIN32])
     328equate_if_defined([WIN_32])
    329329equate_if_defined([WINDOWS])
    330330
  • trunk/source/lisp-kernel/win32/Makefile

    r10580 r10596  
    2222LD = ld
    2323ASFLAGS = -g --32
    24 M4FLAGS = -DWIN32 -DWINDOWS -DX86 -DX8632
    25 CDEFINES = -DWIN32 -DWINDOWS -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE  -D__MSVCRT__ -D__MSVCRT_VERSION__=0x700 -D_WIN32_WINNT=0x0502
     24M4FLAGS = -DWIN_32 -DWINDOWS -DX86 -DX8632
     25CDEFINES = -DWIN_32 -DWINDOWS -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE  -D__MSVCRT__ -D__MSVCRT_VERSION__=0x700 -D_WIN32_WINNT=0x0502
    2626CDEBUG = -g
    2727COPT = #-O2
  • trunk/source/lisp-kernel/win64/Makefile

    r10568 r10596  
    2424LD = x86_64-pc-mingw32-ld
    2525ASFLAGS = -g --64
    26 M4FLAGS = -DWIN64 -DWINDOWS -DX86 -DX8664 -DHAVE_TLS -DEMUTLS
    27 CDEFINES = -DWIN64 -DWINDOWS -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -DHAVE_TLS -DEMUTLS
     26M4FLAGS = -DWIN_64 -DWINDOWS -DX86 -DX8664 -DHAVE_TLS -DEMUTLS
     27CDEFINES = -DWIN_64 -DWINDOWS -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -DHAVE_TLS -DEMUTLS
    2828CDEBUG = -g
    2929COPT = -O2
  • trunk/source/lisp-kernel/windows-calls.c

    r10581 r10596  
    4545
    4646
    47 #ifndef WIN32
     47#ifndef WIN_32
    4848#define _dosmaperr mingw_dosmaperr
    4949#else
  • trunk/source/lisp-kernel/x86-asmutils32.s

    r10587 r10596  
    168168_endfn                         
    169169
    170         __ifdef([WIN32])
     170        __ifdef([WIN_32])
    171171_exportfn(C(restore_windows_context))
    172172Xrestore_windows_context_start:
Note: See TracChangeset for help on using the changeset viewer.