RE: CVS Feature Branch - Windows Build Broken - lib/xgethostname.c& WinSock

[Conrad T. Pino]

Hi Mark,

The follow patch seems to work but it's definitely a hack and
not a pretty one in my opinion.

Conrad

Index: windows-NT/unistd.h
===================================================================
RCS file: /cvs/ccvs/windows-NT/unistd.h,v
retrieving revision 1.3
diff -u -p -r1.3 unistd.h
--- windows-NT/unistd.h 6 Oct 2004 23:57:51 -0000       1.3
+++ windows-NT/unistd.h 22 Nov 2004 18:31:51 -0000
@@ -23,6 +23,7 @@

 int chdir (const char *path);
 int close (int fd);
+int __stdcall gethostname (char * name, int namelen);

 #if 0 /* someday maybe these should be added here as well */

--------------------Configuration: libcvs - Win32 Debug--------------------
Compiling...
fncase.c
getopt.c
getopt1.c
save-cwd.c
setenv.c
h:\conrad\projects\cvs-1.12\lib\allocsa.h(92) : warning C4116: unnamed type 
definition in parentheses
h:\conrad\projects\cvs-1.12\lib\allocsa.h(93) : warning C4116: unnamed type 
definition in parentheses
sighandle.c
unsetenv.c
valloc.c
xgetcwd.c
xgethostname.c
xreadlink.c
h:\conrad\projects\cvs-1.12\lib\xreadlink.c(66) : warning C4090: 'function' : 
different 'const' qualifiers
h:\conrad\projects\cvs-1.12\lib\xreadlink.c(66) : warning C4024: 'readlink' : 
different types for formal and actual parameter 1
Creating library...
--------------------Configuration: libdiff - Win32 Debug--------------------
Compiling...
analyze.c
H:\Conrad\Projects\cvs-1.12\diff\analyze.c(430) : warning C4018: '<' : 
signed/unsigned mismatch
H:\Conrad\Projects\cvs-1.12\diff\analyze.c(432) : warning C4018: '<' : 
signed/unsigned mismatch
H:\Conrad\Projects\cvs-1.12\diff\analyze.c(469) : warning C4018: '>' : 
signed/unsigned mismatch
H:\Conrad\Projects\cvs-1.12\diff\analyze.c(497) : warning C4018: '<' : 
signed/unsigned mismatch
H:\Conrad\Projects\cvs-1.12\diff\analyze.c(506) : warning C4018: '>' : 
signed/unsigned mismatch
H:\Conrad\Projects\cvs-1.12\diff\analyze.c(517) : warning C4018: '>' : 
signed/unsigned mismatch
H:\Conrad\Projects\cvs-1.12\diff\analyze.c(537) : warning C4018: '<' : 
signed/unsigned mismatch
H:\Conrad\Projects\cvs-1.12\diff\analyze.c(550) : warning C4018: '<' : 
signed/unsigned mismatch
H:\Conrad\Projects\cvs-1.12\diff\analyze.c(568) : warning C4018: '<' : 
signed/unsigned mismatch
H:\Conrad\Projects\cvs-1.12\diff\analyze.c(1060) : warning C4090: 'function' : 
different 'const' qualifiers
H:\Conrad\Projects\cvs-1.12\diff\analyze.c(1060) : warning C4022: 'free' : 
pointer mismatch for actual parameter 1
cmpbuf.c
context.c
diff.c
H:\Conrad\Projects\cvs-1.12\diff\diff.c(603) : warning C4013: 'error' 
undefined; assuming extern returning int
diff3.c
dir.c
H:\Conrad\Projects\cvs-1.12\diff\dir.c(114) : warning C4018: '<' : 
signed/unsigned mismatch
H:\Conrad\Projects\cvs-1.12\diff\dir.c(122) : warning C4090: 'function' : 
different 'const' qualifiers
H:\Conrad\Projects\cvs-1.12\diff\dir.c(122) : warning C4022: 'qsort' : pointer 
mismatch for actual parameter 1
H:\Conrad\Projects\cvs-1.12\diff\dir.c(122) : warning C4113: 'int (__cdecl 
*)()' differs in parameter lists from 'int (__cdecl
*)(const void *,const void *)'
H:\Conrad\Projects\cvs-1.12\diff\dir.c(212) : warning C4090: 'function' : 
different 'const' qualifiers
H:\Conrad\Projects\cvs-1.12\diff\dir.c(212) : warning C4022: 'free' : pointer 
mismatch for actual parameter 1
ed.c
ifdef.c
io.c
H:\Conrad\Projects\cvs-1.12\diff\io.c(143) : warning C4018: '<' : 
signed/unsigned mismatch
H:\Conrad\Projects\cvs-1.12\diff\io.c(149) : warning C4018: '<' : 
signed/unsigned mismatch
normal.c
side.c
util.c
Creating library...
libcvs.lib(asnprintf.obj) : warning LNK4006: _asnprintf already defined in 
libcvs.lib(asnprintf.obj); second definition ignored
libcvs.lib(basename.obj) : warning LNK4006: _base_name already defined in 
libcvs.lib(basename.obj); second definition ignored
libcvs.lib(basename.obj) : warning LNK4006: _base_len already defined in 
libcvs.lib(basename.obj); second definition ignored
libcvs.lib(dirname.obj) : warning LNK4006: _dir_len already defined in 
libcvs.lib(dirname.obj); second definition ignored
libcvs.lib(dirname.obj) : warning LNK4006: _dir_name already defined in 
libcvs.lib(dirname.obj); second definition ignored
libcvs.lib(exitfail.obj) : warning LNK4006: _exit_failure already defined in 
libcvs.lib(exitfail.obj); second definition ignored
libcvs.lib(fncase.obj) : warning LNK4006: _fncmp already defined in 
libcvs.lib(fncase.obj); second definition ignored
libcvs.lib(fncase.obj) : warning LNK4006: _fnfold already defined in 
libcvs.lib(fncase.obj); second definition ignored
libcvs.lib(fncase.obj) : warning LNK4006: _OSX_filename_classes already defined 
in libcvs.lib(fncase.obj); second definition ignored
libcvs.lib(fncase.obj) : warning LNK4006: _WNT_filename_classes already defined 
in libcvs.lib(fncase.obj); second definition ignored
libcvs.lib(fnmatch.obj) : warning LNK4006: _fnmatch already defined in 
libcvs.lib(fnmatch.obj); second definition ignored
libcvs.lib(fseeko.obj) : warning LNK4006: _fseeko already defined in 
libcvs.lib(fseeko.obj); second definition ignored
libcvs.lib(ftello.obj) : warning LNK4006: _ftello already defined in 
libcvs.lib(ftello.obj); second definition ignored
libcvs.lib(getdate.obj) : warning LNK4006: _yyparse already defined in 
libcvs.lib(getdate.obj); second definition ignored
libcvs.lib(getdate.obj) : warning LNK4006: _get_date already defined in 
libcvs.lib(getdate.obj); second definition ignored
libcvs.lib(getline.obj) : warning LNK4006: _getdelim already defined in 
libcvs.lib(getline.obj); second definition ignored
libcvs.lib(getline.obj) : warning LNK4006: _getline already defined in 
libcvs.lib(getline.obj); second definition ignored
libcvs.lib(getndelim2.obj) : warning LNK4006: _getndelim2 already defined in 
libcvs.lib(getndelim2.obj); second definition ignored
libcvs.lib(getopt.obj) : warning LNK4006: __getopt_internal_r already defined 
in libcvs.lib(getopt.obj); second definition ignored
libcvs.lib(getopt.obj) : warning LNK4006: __getopt_internal already defined in 
libcvs.lib(getopt.obj); second definition ignored
libcvs.lib(getopt.obj) : warning LNK4006: ___GETOPT_PREFIXgetopt already 
defined in libcvs.lib(getopt.obj); second definition
ignored
libcvs.lib(getopt.obj) : warning LNK4006: ___GETOPT_PREFIXoptopt already 
defined in libcvs.lib(getopt.obj); second definition
ignored
libcvs.lib(getopt.obj) : warning LNK4006: ___GETOPT_PREFIXopterr already 
defined in libcvs.lib(getopt.obj); second definition
ignored
libcvs.lib(getopt.obj) : warning LNK4006: ___GETOPT_PREFIXoptind already 
defined in libcvs.lib(getopt.obj); second definition
ignored
libcvs.lib(getopt1.obj) : warning LNK4006: ___GETOPT_PREFIXgetopt_long already 
defined in libcvs.lib(getopt1.obj); second definition
ignored
libcvs.lib(getopt1.obj) : warning LNK4006: __getopt_long_r already defined in 
libcvs.lib(getopt1.obj); second definition ignored
libcvs.lib(getopt1.obj) : warning LNK4006: ___GETOPT_PREFIXgetopt_long_only 
already defined in libcvs.lib(getopt1.obj); second
definition ignored
libcvs.lib(getopt1.obj) : warning LNK4006: __getopt_long_only_r already defined 
in libcvs.lib(getopt1.obj); second definition
ignored
libcvs.lib(gettime.obj) : warning LNK4006: _gettime already defined in 
libcvs.lib(gettime.obj); second definition ignored
libcvs.lib(md5.obj) : warning LNK4006: _md5_init_ctx already defined in 
libcvs.lib(md5.obj); second definition ignored
libcvs.lib(md5.obj) : warning LNK4006: _md5_read_ctx already defined in 
libcvs.lib(md5.obj); second definition ignored
libcvs.lib(md5.obj) : warning LNK4006: _md5_finish_ctx already defined in 
libcvs.lib(md5.obj); second definition ignored
libcvs.lib(md5.obj) : warning LNK4006: _md5_stream already defined in 
libcvs.lib(md5.obj); second definition ignored
libcvs.lib(md5.obj) : warning LNK4006: _md5_buffer already defined in 
libcvs.lib(md5.obj); second definition ignored
libcvs.lib(md5.obj) : warning LNK4006: _md5_process_bytes already defined in 
libcvs.lib(md5.obj); second definition ignored
libcvs.lib(md5.obj) : warning LNK4006: _md5_process_block already defined in 
libcvs.lib(md5.obj); second definition ignored
libcvs.lib(printf-args.obj) : warning LNK4006: _printf_fetchargs already 
defined in libcvs.lib(printf-args.obj); second definition
ignored
libcvs.lib(printf-parse.obj) : warning LNK4006: _printf_parse already defined 
in libcvs.lib(printf-parse.obj); second definition
ignored
libcvs.lib(readlink.obj) : warning LNK4006: _readlink already defined in 
libcvs.lib(readlink.obj); second definition ignored
libcvs.lib(realloc.obj) : warning LNK4006: _rpl_realloc already defined in 
libcvs.lib(realloc.obj); second definition ignored
libcvs.lib(regex.obj) : warning LNK4006: _re_set_syntax already defined in 
libcvs.lib(regex.obj); second definition ignored
libcvs.lib(regex.obj) : warning LNK4006: _re_compile_fastmap already defined in 
libcvs.lib(regex.obj); second definition ignored
libcvs.lib(regex.obj) : warning LNK4006: _re_set_registers already defined in 
libcvs.lib(regex.obj); second definition ignored
libcvs.lib(regex.obj) : warning LNK4006: _re_search already defined in 
libcvs.lib(regex.obj); second definition ignored
libcvs.lib(regex.obj) : warning LNK4006: _re_search_2 already defined in 
libcvs.lib(regex.obj); second definition ignored
libcvs.lib(regex.obj) : warning LNK4006: _re_match already defined in 
libcvs.lib(regex.obj); second definition ignored
libcvs.lib(regex.obj) : warning LNK4006: _re_match_2 already defined in 
libcvs.lib(regex.obj); second definition ignored
libcvs.lib(regex.obj) : warning LNK4006: _re_compile_pattern already defined in 
libcvs.lib(regex.obj); second definition ignored
libcvs.lib(regex.obj) : warning LNK4006: _re_comp already defined in 
libcvs.lib(regex.obj); second definition ignored
libcvs.lib(regex.obj) : warning LNK4006: _re_exec already defined in 
libcvs.lib(regex.obj); second definition ignored
libcvs.lib(regex.obj) : warning LNK4006: _regcomp already defined in 
libcvs.lib(regex.obj); second definition ignored
libcvs.lib(regex.obj) : warning LNK4006: _regexec already defined in 
libcvs.lib(regex.obj); second definition ignored
libcvs.lib(regex.obj) : warning LNK4006: _regerror already defined in 
libcvs.lib(regex.obj); second definition ignored
libcvs.lib(regex.obj) : warning LNK4006: _regfree already defined in 
libcvs.lib(regex.obj); second definition ignored
libcvs.lib(regex.obj) : warning LNK4006: _re_max_failures already defined in 
libcvs.lib(regex.obj); second definition ignored
libcvs.lib(rpmatch.obj) : warning LNK4006: _rpmatch already defined in 
libcvs.lib(rpmatch.obj); second definition ignored
libcvs.lib(save-cwd.obj) : warning LNK4006: _save_cwd already defined in 
libcvs.lib(save-cwd.obj); second definition ignored
libcvs.lib(save-cwd.obj) : warning LNK4006: _restore_cwd already defined in 
libcvs.lib(save-cwd.obj); second definition ignored
libcvs.lib(save-cwd.obj) : warning LNK4006: _free_cwd already defined in 
libcvs.lib(save-cwd.obj); second definition ignored
libcvs.lib(setenv.obj) : warning LNK4006: ___add_to_environ already defined in 
libcvs.lib(setenv.obj); second definition ignored
libcvs.lib(setenv.obj) : warning LNK4006: _setenv already defined in 
libcvs.lib(setenv.obj); second definition ignored
libcvs.lib(setenv.obj) : warning LNK4006: _clearenv already defined in 
libcvs.lib(setenv.obj); second definition ignored
libcvs.lib(sighandle.obj) : warning LNK4006: _SIG_beginCrSect already defined 
in libcvs.lib(sighandle.obj); second definition
ignored
libcvs.lib(sighandle.obj) : warning LNK4006: _SIG_endCrSect already defined in 
libcvs.lib(sighandle.obj); second definition ignored
libcvs.lib(sighandle.obj) : warning LNK4006: _SIG_register already defined in 
libcvs.lib(sighandle.obj); second definition ignored
libcvs.lib(sighandle.obj) : warning LNK4006: _SIG_deregister already defined in 
libcvs.lib(sighandle.obj); second definition ignored
libcvs.lib(sighandle.obj) : warning LNK4006: _SIG_inCrSect already defined in 
libcvs.lib(sighandle.obj); second definition ignored
libcvs.lib(strcasecmp.obj) : warning LNK4006: _strcasecmp already defined in 
libcvs.lib(strcasecmp.obj); second definition ignored
libcvs.lib(strftime.obj) : warning LNK4006: _nstrftime already defined in 
libcvs.lib(strftime.obj); second definition ignored
libcvs.lib(stripslash.obj) : warning LNK4006: _strip_trailing_slashes already 
defined in libcvs.lib(stripslash.obj); second
definition ignored
libcvs.lib(time_r.obj) : warning LNK4006: _rpl_asctime_r already defined in 
libcvs.lib(time_r.obj); second definition ignored
libcvs.lib(time_r.obj) : warning LNK4006: _rpl_ctime_r already defined in 
libcvs.lib(time_r.obj); second definition ignored
libcvs.lib(time_r.obj) : warning LNK4006: _rpl_gmtime_r already defined in 
libcvs.lib(time_r.obj); second definition ignored
libcvs.lib(time_r.obj) : warning LNK4006: _rpl_localtime_r already defined in 
libcvs.lib(time_r.obj); second definition ignored
libcvs.lib(unsetenv.obj) : warning LNK4006: _unsetenv already defined in 
libcvs.lib(unsetenv.obj); second definition ignored
libcvs.lib(valloc.obj) : warning LNK4006: _valloc already defined in 
libcvs.lib(valloc.obj); second definition ignored
libcvs.lib(vasnprintf.obj) : warning LNK4006: _vasnprintf already defined in 
libcvs.lib(vasnprintf.obj); second definition ignored
libcvs.lib(vasprintf.obj) : warning LNK4006: _vasprintf already defined in 
libcvs.lib(vasprintf.obj); second definition ignored
libcvs.lib(xalloc-die.obj) : warning LNK4006: _xalloc_die already defined in 
libcvs.lib(xalloc-die.obj); second definition ignored
libcvs.lib(xgetcwd.obj) : warning LNK4006: _xgetcwd already defined in 
libcvs.lib(xgetcwd.obj); second definition ignored
libcvs.lib(xgethostname.obj) : warning LNK4006: _xgethostname already defined 
in libcvs.lib(xgethostname.obj); second definition
ignored
libcvs.lib(xmalloc.obj) : warning LNK4006: _xnmalloc already defined in 
libcvs.lib(xmalloc.obj); second definition ignored
libcvs.lib(xmalloc.obj) : warning LNK4006: _xmalloc already defined in 
libcvs.lib(xmalloc.obj); second definition ignored
libcvs.lib(xmalloc.obj) : warning LNK4006: _xnrealloc already defined in 
libcvs.lib(xmalloc.obj); second definition ignored
libcvs.lib(xmalloc.obj) : warning LNK4006: _xrealloc already defined in 
libcvs.lib(xmalloc.obj); second definition ignored
libcvs.lib(xmalloc.obj) : warning LNK4006: _x2nrealloc already defined in 
libcvs.lib(xmalloc.obj); second definition ignored
libcvs.lib(xmalloc.obj) : warning LNK4006: _x2realloc already defined in 
libcvs.lib(xmalloc.obj); second definition ignored
libcvs.lib(xmalloc.obj) : warning LNK4006: _xzalloc already defined in 
libcvs.lib(xmalloc.obj); second definition ignored
libcvs.lib(xmalloc.obj) : warning LNK4006: _xcalloc already defined in 
libcvs.lib(xmalloc.obj); second definition ignored
libcvs.lib(xmalloc.obj) : warning LNK4006: _xmemdup already defined in 
libcvs.lib(xmalloc.obj); second definition ignored
libcvs.lib(xmalloc.obj) : warning LNK4006: _xstrdup already defined in 
libcvs.lib(xmalloc.obj); second definition ignored
libcvs.lib(xreadlink.obj) : warning LNK4006: _xreadlink already defined in 
libcvs.lib(xreadlink.obj); second definition ignored
libcvs.lib(yesno.obj) : warning LNK4006: _yesno already defined in 
libcvs.lib(yesno.obj); second definition ignored
--------------------Configuration: cvsnt - Win32 Debug--------------------
Compiling...
add.c
admin.c
annotate.c
buffer.c
H:\Conrad\Projects\cvs-1.12\src\buffer.c(197) : warning C4018: '>=' : 
signed/unsigned mismatch
H:\Conrad\Projects\cvs-1.12\src\buffer.c(1094) : warning C4018: '==' : 
signed/unsigned mismatch
H:\Conrad\Projects\cvs-1.12\src\buffer.c(1151) : warning C4018: '>=' : 
signed/unsigned mismatch
H:\Conrad\Projects\cvs-1.12\src\buffer.c(1195) : warning C4018: '<=' : 
signed/unsigned mismatch
H:\Conrad\Projects\cvs-1.12\src\buffer.c(1220) : warning C4018: '==' : 
signed/unsigned mismatch
checkin.c
checkout.c
classify.c
client.c
commit.c
create_adm.c
cvsrc.c
diff.c
edit.c
entries.c
error.c
exithandle.c
expand_path.c
fileattr.c
filesubr.c
find_names.c
hash.c
history.c
ignore.c
import.c
lock.c
log-buffer.c
log.c
login.c
logmsg.c
ls.c
main.c
mkdir.c
mkmodules.c
modules.c
myndbm.c
no_diff.c
parseinfo.c
patch.c
rcmd.c
rcs.c
H:\Conrad\Projects\cvs-1.12\src\rcs.c(1526) : warning C4018: '>' : 
signed/unsigned mismatch
rcscmds.c
recurse.c
release.c
remove.c
repos.c
root.c
H:\Conrad\Projects\cvs-1.12\src\root.c(188) : warning C4101: 'translated' : 
unreferenced local variable
H:\Conrad\Projects\cvs-1.12\src\root.c(234) : warning C4101: 'translated' : 
unreferenced local variable
rsh-client.c
run.c
scramble.c
server.c
socket-client.c
H:\Conrad\Projects\cvs-1.12\src\socket-client.c(91) : warning C4028: formal 
parameter 3 different from declaration
H:\Conrad\Projects\cvs-1.12\src\socket-client.c(91) : warning C4028: formal 
parameter 4 different from declaration
H:\Conrad\Projects\cvs-1.12\src\socket-client.c(91) : warning C4028: formal 
parameter 5 different from declaration
H:\Conrad\Projects\cvs-1.12\src\socket-client.c(91) : warning C4024: 
'buf_initialize' : different types for formal and actual
parameter 1
H:\Conrad\Projects\cvs-1.12\src\socket-client.c(92) : warning C4028: formal 
parameter 3 different from declaration
H:\Conrad\Projects\cvs-1.12\src\socket-client.c(92) : warning C4028: formal 
parameter 4 different from declaration
H:\Conrad\Projects\cvs-1.12\src\socket-client.c(92) : warning C4024: 
'buf_initialize' : different types for formal and actual
parameter 2
stack.c
startserver.c
status.c
subr.c
tag.c
H:\Conrad\Projects\cvs-1.12\src\subr.c(1749) : warning C4761: integral size 
mismatch in argument; conversion supplied
update.c
vers_ts.c
version.c
watch.c
woe32.c
wrapper.c
zlib.c
H:\Conrad\Projects\cvs-1.12\src\zlib.c(205) : warning C4018: '>=' : 
signed/unsigned mismatch
Linking...
LINK : LNK6004: .\WinDebug\cvs.exe not found or not built by the last 
incremental link; performing full link

cvs.exe - 0 error(s), 134 warning(s)