BIND 10 trac826, updated. a788c6f2f44993c8307b3c4aa15971d982d49400 fix locks

[BIND 10 source code commits]

The branch, trac826 has been updated
       via  a788c6f2f44993c8307b3c4aa15971d982d49400 (commit)
      from  b4e7692485b35a7d1564c14b73b4e641123227b0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a788c6f2f44993c8307b3c4aa15971d982d49400
Author: Francis Dupont <fdupont at isc.org>
Date:   Wed Jun 27 22:38:06 2012 +0200

    fix locks

-----------------------------------------------------------------------

Summary of changes:
 src/lib/util/interprocess_sync_file.cc    |    2 +-
 win32build/VS2008/libutil/libutil.vcproj  |    6 ++++--
 win32build/VS2010/libutil/libutil.vcxproj |   14 ++++++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/util/interprocess_sync_file.cc b/src/lib/util/interprocess_sync_file.cc
index ef90941..6351e08 100644
--- a/src/lib/util/interprocess_sync_file.cc
+++ b/src/lib/util/interprocess_sync_file.cc
@@ -55,7 +55,7 @@ InterprocessSyncFile::do_lock(int cmd, short l_type) {
     // implementation, it doesn't attempt any opens.
     if
 #ifdef _WIN32
-       (fd_ != INVALID_HANDLE_VALUE)
+       (fd_ == INVALID_HANDLE_VALUE)
 #else
        (fd_ == -1)
 #endif
diff --git a/win32build/VS2008/libutil/libutil.vcproj b/win32build/VS2008/libutil/libutil.vcproj
index c9c7cf5..75c1f36 100755
--- a/win32build/VS2008/libutil/libutil.vcproj
+++ b/win32build/VS2008/libutil/libutil.vcproj
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\exceptions;..\..\..\src\lib\util;"$(BOOST)""
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LOCKFILE_DIR=\"locks\""
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LOCKFILE_DIR=\"/Temp/locks\""
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -77,6 +77,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="mkdir \Temp\locks&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -108,7 +109,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\exceptions;..\..\..\src\lib\util;"$(BOOST)""
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LOCKFILE_DIR=\"locks\""
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LOCKFILE_DIR=\"/Temp/locks\""
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -141,6 +142,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="mkdir \Temp\locks&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/win32build/VS2010/libutil/libutil.vcxproj b/win32build/VS2010/libutil/libutil.vcxproj
index c677f65..cd6d562 100755
--- a/win32build/VS2010/libutil/libutil.vcxproj
+++ b/win32build/VS2010/libutil/libutil.vcxproj
@@ -81,7 +81,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;LOCKFILE_DIR="locks";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;LOCKFILE_DIR="/Temp/locks";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\exceptions;..\..\..\src\lib\util;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
@@ -95,6 +95,11 @@ copy gen_wiredata.py.win32 gen_wiredata.py
 copy mkpywrapper.py.win32 mkpywrapper.py
 </Command>
     </PreBuildEvent>
+    <PostBuildEvent>
+      <Command>mkdir C:\Temp\locks
+exit 0
+</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -103,7 +108,7 @@ copy mkpywrapper.py.win32 mkpywrapper.py
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;LOCKFILE_DIR="locks";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;LOCKFILE_DIR="/Temp/locks";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\exceptions;..\..\..\src\lib\util;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
@@ -119,6 +124,11 @@ copy gen_wiredata.py.win32 gen_wiredata.py
 copy mkpywrapper.py.win32 mkpywrapper.py
 </Command>
     </PreBuildEvent>
+    <PostBuildEvent>
+      <Command>mkdir C:\Temp\locks
+exit 0
+</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">