Feature Branch Windows Build Broken - New GNULIB glob module

[Conrad T. Pino]

The following patch lets me get this far in the Windows IDE build:
--------------------Configuration: libcvs - Win32 Debug--------------------
Compiling...
glob.c
H:\Conrad\Projects\cvs-1.12\lib\glob.c(253) : warning C4028: formal parameter 1 
different from declaration
H:\Conrad\Projects\cvs-1.12\lib\glob.c(253) : warning C4028: formal parameter 4 
different from declaration
H:\Conrad\Projects\cvs-1.12\lib\glob.c(668) : warning C4090: 'function' : 
different 'const' qualifiers
H:\Conrad\Projects\cvs-1.12\lib\glob.c(668) : warning C4024: 'getpwnam' : 
different types for formal and actual parameter 1
H:\Conrad\Projects\cvs-1.12\lib\glob.c(739) : warning C4013: 'glob_pattern_p' 
undefined; assuming extern returning int
H:\Conrad\Projects\cvs-1.12\lib\glob.c(334) : fatal error C1600: unsupported 
data type
Error executing cl.exe.

cvs.exe - 1 error(s), 5 warning(s)
===================================================================
The following patches do the following:

1. Add WIN32 conditional #defines to "lib/glob_.h" to hide compile
errors.

2. Modify "lib/libcvs.dsp" to make "lib/glob.h" file
from "lib/glob_.h" file.

3. Modify Modify "lib/libcvs.dsp" to build "lib/glob.c" which is
where the compile is failing after my hacks to "lib/glob_.h" file.
===================================================================
Index: lib/glob_.h
===================================================================
RCS file: /cvs/ccvs/lib/glob_.h,v
retrieving revision 1.5
diff -u -p -r1.5 glob_.h
--- lib/glob_.h 15 May 2005 16:44:04 -0000      1.5
+++ lib/glob_.h 17 May 2005 04:18:51 -0000
@@ -19,6 +19,12 @@
 #ifndef        _GLOB_H
 #define        _GLOB_H 1
 
+#ifdef WIN32
+#define __BEGIN_DECLS
+#define __END_DECLS
+#define __const const
+#endif
+
 #ifdef _LIBC
 # include <sys/cdefs.h>
 #else
Index: lib/libcvs.dsp
===================================================================
RCS file: /cvs/ccvs/lib/libcvs.dsp,v
retrieving revision 1.22
diff -u -p -r1.22 libcvs.dsp
--- lib/libcvs.dsp      8 May 2005 07:10:06 -0000       1.22
+++ lib/libcvs.dsp      17 May 2005 04:18:51 -0000
@@ -157,6 +157,10 @@ SOURCE=.\gettime.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\glob.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\md5.c
 # End Source File
 # Begin Source File
@@ -418,6 +422,25 @@ SOURCE=.\gettext.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\glob_.h
+
+!IF  "$(CFG)" == "libcvs - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libcvs - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\glob_.h
+
+".\glob.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy .\glob_.h .\glob.h
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\md5.h
 # End Source File
 # Begin Source File
@@ -482,11 +505,11 @@ SOURCE=.\timespec.h
 # End Source File
 # Begin Source File
 
-SOURCE="..\windows-NT\unistd.h"
+SOURCE=".\unistd-safer.h"
 # End Source File
 # Begin Source File
 
-SOURCE=".\unistd-safer.h"
+SOURCE="..\windows-NT\unistd.h"
 # End Source File
 # Begin Source File