diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-03-12 13:22:02 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-03-12 13:22:02 +0100 |
| commit | deeb3ee4258852940e48b0b7b950bc5e951831b4 (patch) | |
| tree | f1eb3ac56ebb042ac46ccacf30780dbba5e96b9b /VC++Files | |
| parent | 3c8117277601c48a86302ec40dc789a468a425c9 (diff) | |
| parent | d429f590111698d88cfece92c1f3e059af2be306 (diff) | |
| download | mariadb-git-deeb3ee4258852940e48b0b7b950bc5e951831b4.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
VC++Files/mysys/mysys.vcproj:
Auto merged
VC++Files/mysys/mysys_ia64.dsp:
Auto merged
mysys/Makefile.am:
Auto merged
BitKeeper/deleted/.del-my_semaphore.c:
Auto merged
VC++Files/mysys/mysys.dsp:
SCCS merged
Diffstat (limited to 'VC++Files')
| -rw-r--r-- | VC++Files/mysys/mysys.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/mysys/mysys.vcproj | 43 | ||||
| -rw-r--r-- | VC++Files/mysys/mysys_ia64.dsp | 4 |
3 files changed, 0 insertions, 51 deletions
diff --git a/VC++Files/mysys/mysys.dsp b/VC++Files/mysys/mysys.dsp index 0f1b4bd5d54..a920a0bd967 100644 --- a/VC++Files/mysys/mysys.dsp +++ b/VC++Files/mysys/mysys.dsp @@ -557,10 +557,6 @@ SOURCE=.\my_windac.c # End Source File # Begin Source File -SOURCE=.\my_winsem.c -# End Source File -# Begin Source File - SOURCE=.\my_winthread.c # End Source File # Begin Source File diff --git a/VC++Files/mysys/mysys.vcproj b/VC++Files/mysys/mysys.vcproj index 87100ce8e5e..73aa649394e 100644 --- a/VC++Files/mysys/mysys.vcproj +++ b/VC++Files/mysys/mysys.vcproj @@ -4324,49 +4324,6 @@ </FileConfiguration> </File> <File - RelativePath="my_winsem.c"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Max|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="TLS_DEBUG|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="TLS|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - </File> - <File RelativePath="my_winthread.c"> <FileConfiguration Name="Debug|Win32"> diff --git a/VC++Files/mysys/mysys_ia64.dsp b/VC++Files/mysys/mysys_ia64.dsp index 10d6ca7960a..4e4f71d89ba 100644 --- a/VC++Files/mysys/mysys_ia64.dsp +++ b/VC++Files/mysys/mysys_ia64.dsp @@ -538,10 +538,6 @@ SOURCE=.\my_wincond.c # End Source File # Begin Source File -SOURCE=.\my_winsem.c -# End Source File -# Begin Source File - SOURCE=.\my_winthread.c # End Source File # Begin Source File |