Minor changes to Visual C++ project.

diff --git a/apitest/apitest.dsp b/apitest/apitest.dsp
index 526cecf..b165c50 100755 (executable)
--- a/apitest/apitest.dsp
+++ b/apitest/apitest.dsp
@@ -1,161 +1,101 @@
-# Microsoft Developer Studio Project File - Name="apitest" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 5.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
-\r
-CFG=apitest - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "apitest.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "apitest.mak" CFG="apitest - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "apitest - Win32 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "apitest - Win32 Debug" (based on "Win32 (x86) Console Application")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "apitest - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\yaz\include" /I "..\index" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WINDOWS" /YX /FD /c\r
-# ADD BASE RSC /l 0x406 /d "NDEBUG"\r
-# ADD RSC /l 0x406 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# 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 /subsystem:console /machine:I386\r
-# 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 zebra.lib yaz.lib server.lib /nologo /subsystem:console /machine:I386 /libpath:"..\debug" /libpath:"..\..\yaz\debug" /libpath:"..\..\yaz\server\debug"\r
-# Begin Special Build Tool\r
-OutDir=.\Release\r
-ProjDir=.\r
-TargetName=apitest\r
-SOURCE=$(InputPath)\r
-PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\bin\r
-# End Special Build Tool\r
-\r
-!ELSEIF  "$(CFG)" == "apitest - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\yaz\include" /I "..\index" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WINDOWS" /YX /FD /c\r
-# ADD BASE RSC /l 0x406 /d "_DEBUG"\r
-# ADD RSC /l 0x406 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# 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 /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# 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 zebra.lib yaz.lib server.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\debug" /libpath:"..\..\yaz\debug" /libpath:"..\..\yaz\server\debug"\r
-# Begin Special Build Tool\r
-OutDir=.\Debug\r
-ProjDir=.\r
-TargetName=apitest\r
-SOURCE=$(InputPath)\r
-PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\bin\r
-# End Special Build Tool\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "apitest - Win32 Release"\r
-# Name "apitest - Win32 Debug"\r
-# Begin Source File\r
-\r
-SOURCE=..\index\apitest.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\index\attribute.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\index\kcompare.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\index\locksrv.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\index\lockutil.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\index\rank1.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\index\recindex.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\index\retrieve.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\index\sortidx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\index\symtab.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\index\trunc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\index\zebraapi.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\index\zinfo.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\index\zlogs.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\index\zrpn.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\index\zsets.c\r
-# End Source File\r
-# End Target\r
-# End Project\r
+# Microsoft Developer Studio Project File - Name="apitest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=apitest - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "apitest.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apitest.mak" CFG="apitest - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apitest - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "apitest - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "apitest - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\yaz\include" /I "..\index" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x406 /d "NDEBUG"
+# ADD RSC /l 0x406 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 /subsystem:console /machine:I386
+# 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 zebra.lib yaz.lib server.lib /nologo /subsystem:console /machine:I386 /libpath:"..\debug" /libpath:"..\..\yaz\debug" /libpath:"..\..\yaz\server\debug"
+# Begin Special Build Tool
+OutDir=.\Release
+ProjDir=.
+TargetName=apitest
+SOURCE=$(InputPath)
+PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\bin
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apitest - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\yaz\include" /I "..\index" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WINDOWS" /YX /FD /c
+# ADD BASE RSC /l 0x406 /d "_DEBUG"
+# ADD RSC /l 0x406 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
+# 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 zebra.lib yaz.lib server.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\debug" /libpath:"..\..\yaz\debug" /libpath:"..\..\yaz\server\debug"
+# Begin Special Build Tool
+OutDir=.\Debug
+ProjDir=.
+TargetName=apitest
+SOURCE=$(InputPath)
+PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\bin
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "apitest - Win32 Release"
+# Name "apitest - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\index\apitest.c
+# End Source File
+# End Target
+# End Project

diff --git a/util/passwddb.c b/util/passwddb.c
index ad14e8e..4595f43 100644 (file)
--- a/util/passwddb.c
+++ b/util/passwddb.c
@@ -4,16 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: passwddb.c,v $
- * Revision 1.2  1998-06-25 09:55:51  adam
+ * Revision 1.3  1998-06-25 19:16:32  adam
+ * Minor changes to Visual C++ project.
+ *
+ * Revision 1.2  1998/06/25 09:55:51  adam
  * Minor changes - fixex headers.
  *
  */
+#ifdef WINDOWS
+#else
 #include <unistd.h>
+#endif
 #include <string.h>
 #include <stdio.h>
 
 #ifndef USE_CRYPT
-#define USE_CRYPT 1
+#define USE_CRYPT 0
 #endif
 
 #if USE_CRYPT

diff --git a/zebra.dsp b/zebra.dsp
index a1ed581..5bcb189 100644 (file)
--- a/zebra.dsp
+++ b/zebra.dsp
@@ -76,6 +76,10 @@ LIB32=link.exe -lib
 # Name "zebra - Win32 Debug"
 # Begin Source File
 
+SOURCE=.\index\attribute.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\bfile\bfile.c
 # End Source File
 # Begin Source File
@@ -132,6 +136,10 @@ SOURCE=.\dict\insert.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\index\invstat.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\isam\isam.c
 # End Source File
 # Begin Source File
@@ -144,6 +152,22 @@ SOURCE=.\isam\isutil.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\index\kcompare.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\index\lockidx.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\index\locksrv.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\index\lockutil.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\dict\lookgrep.c
 # End Source File
 # Begin Source File
@@ -176,10 +200,18 @@ SOURCE=.\dict\open.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\util\passwddb.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\isam\physical.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\index\rank1.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\dfa\readfile.c
 # End Source File
 # Begin Source File
@@ -192,6 +224,14 @@ SOURCE=.\recctrl\recgrs.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\index\recindex.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\index\recstat.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\recctrl\rectext.c
 # End Source File
 # Begin Source File
@@ -204,6 +244,10 @@ SOURCE=.\util\res.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\index\retrieve.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\isam\rootblk.c
 # End Source File
 # Begin Source File
@@ -248,11 +292,43 @@ SOURCE=.\recctrl\sgmlread.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\index\sortidx.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\dfa\states.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\index\symtab.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\index\trunc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\index\zebraapi.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\util\zebramap.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\index\zinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\index\zlogs.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\index\zrpn.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\index\zsets.c
+# End Source File
 # End Target
 # End Project

diff --git a/zebra.dsw b/zebra.dsw
index fe02fba..91c07ca 100644 (file)
--- a/zebra.dsw
+++ b/zebra.dsw
@@ -11,6 +11,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name zebra
+    End Project Dependency
 }}}
 
 ###############################################################################