Hi Derek, The following patch raises an interesting temptation: https://ccvs.cvshome.org/servlets/ReadMsg?list=cvs&msgNo=3877
Conditional compilation on Windows compiles code that doesn't use the "file_name_concat" function which lead me to omit the file "lib/filenamecat.c" from the "libcvs" project. However the '#include "filenamecat.h"' in "lib/canonicalize.c" is unconditional triggering VC6 to create a false dependency. Does surrounding the '#include ...' in "lib/canonicalize.c" with the same conditional compilation logic as found later on in the same file seem useful to the project as a whole? A patch with the change I'm considering follows below. Conrad > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > Sent: Sunday, June 12, 2005 13:37 > To: [EMAIL PROTECTED] > Subject: CVS update: /ccvs/lib/ > > User: conradpino > Date: 05/06/12 13:37:14 > > Modified: > /ccvs/lib/ > ChangeLog, libcvs.dep, libcvs.dsp, libcvs.mak > > Log: > * libcvs.dsp: Add files "filenamecat.h" and "lstat.c" to project. > * libcvs.dep, libcvs.mak: Regenerate for "libcvs.dsp" changes. > > File Changes: > [snip] Index: lib/canonicalize.c =================================================================== RCS file: /cvs/ccvs/lib/canonicalize.c,v retrieving revision 1.2 diff -u -p -r1.2 canonicalize.c --- lib/canonicalize.c 10 Jun 2005 20:30:20 -0000 1.2 +++ lib/canonicalize.c 13 Jun 2005 20:21:06 -0000 @@ -48,7 +48,9 @@ void free (); #include <stddef.h> #include "cycle-check.h" +#if !HAVE_CANONICALIZE_FILE_NAME && HAVE_RESOLVEPATH #include "filenamecat.h" +#endif /* !HAVE_CANONICALIZE_FILE_NAME && HAVE_RESOLVEPATH */ #include "stat-macros.h" #include "xalloc.h" #include "xgetcwd.h" Index: lib/libcvs.dep =================================================================== RCS file: /cvs/ccvs/lib/libcvs.dep,v retrieving revision 1.28 diff -u -p -r1.28 libcvs.dep --- lib/libcvs.dep 12 Jun 2005 20:37:12 -0000 1.28 +++ lib/libcvs.dep 13 Jun 2005 20:21:06 -0000 @@ -31,7 +31,6 @@ ".\canonicalize.h"\ ".\cycle-check.h"\ ".\dev-ino.h"\ - ".\filenamecat.h"\ ".\pathmax.h"\ ".\stat-macros.h"\ ".\timespec.h"\ Index: lib/libcvs.dsp =================================================================== RCS file: /cvs/ccvs/lib/libcvs.dsp,v retrieving revision 1.27 diff -u -p -r1.27 libcvs.dsp --- lib/libcvs.dsp 12 Jun 2005 20:37:12 -0000 1.27 +++ lib/libcvs.dsp 13 Jun 2005 20:21:06 -0000 @@ -364,10 +364,6 @@ SOURCE=.\exitfail.h # End Source File # Begin Source File -SOURCE=.\filenamecat.h -# End Source File -# Begin Source File - SOURCE=.\fnmatch.h # End Source File # Begin Source File _______________________________________________ Bug-cvs mailing list Bug-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/bug-cvs
