[Cvs-cvs] ccvs/lib ChangeLog libcvs.mak

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/12 14:22:15

Modified files:
        lib            : ChangeLog libcvs.mak 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/ChangeLog?cvsroot=cvs&r1=1.557&r2=1.558
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/libcvs.mak?cvsroot=cvs&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/ChangeLog,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -b -r1.557 -r1.558
--- ChangeLog   18 Dec 2007 21:04:38 -0000      1.557
+++ ChangeLog   12 Sep 2008 14:22:14 -0000      1.558
@@ -1,3 +1,8 @@
+2008-06-14  Mark D. Baushke  <address@hidden>
+
+       * libcvs.mak (CPP_PROJ): Add /I "..\src" to find error.h
+       [Patch provided by "Nelson Bolyard" <address@hidden>]
+
 2007-12-18  Larry Jones  <address@hidden>
 
        * fseeko.c: Update from GNULIB for EOF bug fix.

Index: libcvs.mak
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/libcvs.mak,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- libcvs.mak  22 Sep 2006 17:54:39 -0000      1.35
+++ libcvs.mak  12 Sep 2008 14:22:15 -0000      1.36
@@ -111,7 +111,7 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\windows-NT" /I "." /D "NDEBUG" /D 
"WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /D "WINDOWS32" 
/Fp"$(INTDIR)\libcvs.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\windows-NT" /I "." /D "NDEBUG" /D 
"WIN32" /I "..\src" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /D "WINDOWS32" 
/Fp"$(INTDIR)\libcvs.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libcvs.bsc" 
 BSC32_SBRS= \
@@ -266,7 +266,7 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\windows-NT" /I "." /D 
"_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /D "WINDOWS32" 
/Fp"$(INTDIR)\libcvs.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\windows-NT" /I "." /I 
"..\src" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /D 
"WINDOWS32" /Fp"$(INTDIR)\libcvs.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD 
/GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libcvs.bsc" 
 BSC32_SBRS= \