Changeset 14617 for branches


Ignore:
Timestamp:
Jan 31, 2011, 10:25:35 PM (9 years ago)
Author:
rme
Message:

fixes for compiling for 64-bit windows

Location:
branches/shrink-tcr/lisp-kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/shrink-tcr/lisp-kernel/thread_manager.c

    r14607 r14617  
    157157      *(--p) = (LispObj)raise_thread_interrupt;;
    158158      xpGPR(pcontext,Isp) = (DWORD)p;
    159 #ifdef WIN32_ES_HACK
    160       pcontext->SegEs = pcontext->SegDs;
    161 #endif
    162159    }
    163160#endif
     
    14031400    free_tcr_extra_segment(tcr);
    14041401#endif
    1405 #ifdef WIN32
     1402#ifdef WINDOWS
    14061403    CloseHandle((HANDLE)TCR_AUX(tcr)->io_datum);
    14071404    TCR_AUX(tcr)->io_datum = NULL;
    14081405    free(TCR_AUX(tcr)->native_thread_info);
    14091406    TCR_AUX(tcr)->native_thread_info = NULL;
     1407#ifdef WIN_32
    14101408    free(tcr->aux);
     1409    tcr->aux = NULL;
     1410#endif
    14111411#endif
    14121412    UNLOCK(lisp_global(TCR_AREA_LOCK),current);
     
    22282228    next = TCR_AUX(current)->next;
    22292229#ifndef HAVE_TLS
    2230 #ifdef WIN32
    2231     /* free(current->aux); */
     2230#ifdef WIN_32
     2231    /* We sort of have TLS in that the TEB is per-thread.  We free the
     2232     * tcr aux vector elsewhere. */
    22322233#else
    22332234    free(current);
  • branches/shrink-tcr/lisp-kernel/x86-exceptions.c

    r14606 r14617  
    20192019  context->Esp = (DWORD)p;
    20202020  context->Eip = (DWORD)handler;
    2021 #ifdef WIN32_ES_HACK
    2022   context->SegEs = context->SegDs;
    2023 #endif
    20242021#endif
    20252022  context->EFlags &= ~0x400;  /* clear direction flag */
Note: See TracChangeset for help on using the changeset viewer.