Changeset 5413

Show
Ignore:
Timestamp:
08/10/06 11:01:50
Author:
robert
Message:

From Mike Wittman, support for Windows64 build

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenThreads/trunk/win32_src/OpenThreads.dsp

    r5072 r5413  
    3939# PROP Use_MFC 0 
    4040# PROP Use_Debug_Libraries 0 
    41 # PROP Output_Dir "../lib/Win32" 
    42 # PROP Intermediate_Dir "Release" 
     41# PROP Output_Dir "../bin/$(PlatformName)" 
     42# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)" 
    4343# PROP Ignore_Export_Lib 0 
    4444# PROP Target_Dir "" 
    …… 
    5656# ADD BSC32 /nologo 
    5757LINK32=link.exe 
    58 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 
    59 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"../bin/Win32/OpenThreadsWin32.dll" 
     58# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept 
     59# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"$(OutDir)/OpenThreadsWin32.dll" /implib:"../lib/$(PlatformName)/OpenThreadsWin32.lib" 
    6060 
    6161!ELSEIF  "$(CFG)" == "OpenThreads - Win32 Debug" 
    …… 
    6868# PROP Use_MFC 0 
    6969# PROP Use_Debug_Libraries 1 
    70 # PROP Output_Dir "../lib/Win32/" 
    71 # PROP Intermediate_Dir "Debug" 
     70# PROP Output_Dir "../bin/$(PlatformName)" 
     71# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)" 
    7272# PROP Ignore_Export_Lib 0 
    7373# PROP Target_Dir "" 
    …… 
    8686LINK32=link.exe 
    8787# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept 
    88 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"../bin/Win32/OpenThreadsWin32d.dll" /pdbtype:sept 
     88# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"$(OutDir)/OpenThreadsWin32d.dll" /implib:"../lib/$(PlatformName)/OpenThreadsWin32d.lib" 
    8989 
    9090!ELSEIF  "$(CFG)" == "OpenThreads - Win32 Release Static" 
    …… 
    9898# PROP Use_MFC 0 
    9999# PROP Use_Debug_Libraries 0 
    100 # PROP Output_Dir "Release_Static" 
    101 # PROP Intermediate_Dir "Release_Static" 
     100# PROP Output_Dir "../lib/$(PlatformName)" 
     101# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)_Static" 
    102102# PROP Ignore_Export_Lib 0 
    103103# PROP Target_Dir "" 
    …… 
    116116LIB32=link.exe -lib 
    117117# ADD BASE LIB32 /nologo 
    118 # ADD LIB32 /nologo /out:"../lib/Win32/OpenThreadsWin32_s.lib" 
     118# ADD LIB32 /nologo /out:"../lib/$(PlatformName)/OpenThreadsWin32_s.lib" 
    119119 
    120120!ELSEIF  "$(CFG)" == "OpenThreads - Win32 Debug Static" 
    …… 
    128128# PROP Use_MFC 0 
    129129# PROP Use_Debug_Libraries 1 
    130 # PROP Output_Dir "Debug_Static" 
    131 # PROP Intermediate_Dir "Debug_Static" 
     130# PROP Output_Dir "../lib/$(PlatformName)" 
     131# PROP Intermediate_Dir "$(PlatformName)/$(ConfigurationName)_Static" 
    132132# PROP Ignore_Export_Lib 0 
    133133# PROP Target_Dir "" 
    …… 
    146146LIB32=link.exe -lib 
    147147# ADD BASE LIB32 /nologo 
    148 # ADD LIB32 /nologo /out:"../lib/Win32/OpenThreadsWin32d_s.lib" 
     148# ADD LIB32 /nologo /out:"../lib/$(PlatformName)/OpenThreadsWin32d_s.lib" 
    149149 
    150150!ENDIF  

  • OpenThreads/trunk/win32_src/Win32Thread.cpp

    r4292 r5413  
    560560    Win32ThreadPrivateData *pd = static_cast<Win32ThreadPrivateData *> (_prvData); 
    561561    DWORD affinityMask  = 0x1 << cpunum ; // thread affinity mask 
    562         DWORD res = 
     562        DWORD_PTR res = 
    563563                SetThreadAffinityMask 
    564564                ( 

  • OpenThreads/trunk/win32_src/Win32ThreadPrivateData.h

    r4221 r5413  
    4949    ~Win32ThreadPrivateData(); 
    5050 
    51     unsigned int stackSize; 
     51    size_t stackSize; 
    5252    bool isRunning; 
    5353