win fixes

2 files changed, 28 insertions, 6 deletions

diff --git a/cpp/src/Freeze/DBI.cpp b/cpp/src/Freeze/DBI.cpp
index 961da8e792a..367f89a5531 100644
--- a/cpp/src/Freeze/DBI.cpp
+++ b/cpp/src/Freeze/DBI.cpp
@@ -17,6 +17,12 @@ using namespace std;
 using namespace Ice;
 using namespace Freeze;
 
+#ifdef WIN32
+#   define FREEZE_DB_MODE 0
+#else
+#   define FREEZE_DB_MODE (S_IRUSR | S_IWUSR)
+#endif
+
 Freeze::DBI::DBI(const CommunicatorPtr& communicator, const PropertiesPtr& properties, const DBEnvIPtr& dbenvObj,
 		 ::DB_ENV* dbenv, ::DB* db, const string& name) :
     _communicator(communicator),
@@ -312,7 +318,7 @@ Freeze::DBEnvI::DBEnvI(const CommunicatorPtr& communicator, const PropertiesPtr&
 		       DB_INIT_TXN |
 		       DB_RECOVER |
 		       DB_THREAD,
-		       S_IRUSR | S_IWUSR);
+		       FREEZE_DB_MODE);
     if (ret != 0)
     {
 	ostringstream s;
@@ -370,7 +376,7 @@ Freeze::DBEnvI::open(const string& name)
 	throw ex;
     }
 
-    ret = db->open(db, name.c_str(), 0, DB_BTREE, DB_CREATE | DB_THREAD, S_IRUSR | S_IWUSR);
+    ret = db->open(db, name.c_str(), 0, DB_BTREE, DB_CREATE | DB_THREAD, FREEZE_DB_MODE);
     if(ret != 0)
     {
 	ostringstream s;
diff --git a/cpp/src/Freeze/freeze.dsp b/cpp/src/Freeze/freeze.dsp
index 8c71ec58cb0..d6ae8ca5796 100644
--- a/cpp/src/Freeze/freeze.dsp
+++ b/cpp/src/Freeze/freeze.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /Ze /W3 /GR /GX /O2 /I ".." /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_USRDLL" /D "FREEZE_API_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_USRDLL" /D "FREEZE_API_EXPORTS" /YX /FD /c

 # SUBTRACT CPP /Fr

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # 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

-# ADD LINK32 ws2_32.lib jtc.lib /nologo /dll /machine:I386 /out:"Release/icepack001.dll" /libpath:"../../../lib"

+# ADD LINK32 ws2_32.lib jtc.lib libdb33.lib /nologo /dll /machine:I386 /out:"Release/freeze001.dll" /libpath:"../../../lib"

 # SUBTRACT LINK32 /pdb:none

 # Begin Special Build Tool

 SOURCE="$(InputPath)"

@@ -75,7 +75,7 @@ PostBuild_Cmds=copy Release\icepack001.* ..\..\lib
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /Ze /W3 /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_USRDLL" /D "FREEZE_API_EXPORTS" /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_USRDLL" /D "FREEZE_API_EXPORTS" /YX /FD /GZ /c

 # SUBTRACT CPP /Fr

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # 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

-# ADD LINK32 ws2_32.lib jtcd.lib /nologo /dll /debug /machine:I386 /out:"Debug/icepack001d.dll" /pdbtype:sept /libpath:"../../../lib"

+# ADD LINK32 ws2_32.lib jtcd.lib libdb33d.lib /nologo /dll /debug /machine:I386 /out:"Debug/freeze001d.dll" /pdbtype:sept /libpath:"../../../lib"

 # SUBTRACT LINK32 /pdb:none

 # Begin Special Build Tool

 SOURCE="$(InputPath)"

@@ -106,6 +106,10 @@ PostBuild_Cmds=copy Debug\icepack001d.* ..\..\lib
 

 SOURCE=.\DB.cpp

 # End Source File

+# Begin Source File

+

+SOURCE=.\DBI.cpp

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

@@ -118,6 +122,18 @@ SOURCE=..\..\include\Freeze\DB.h
 

 SOURCE=..\..\include\Freeze\DBF.h

 # End Source File

+# Begin Source File

+

+SOURCE=.\DBI.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\include\Freeze\Freeze.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\include\Freeze\Initialize.h

+# End Source File

 # End Group

 # Begin Group "Resource Files"