Re: CVS Feature Branch - Problem File - src/server.c

[Derek Robert Price]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mark D. Baushke wrote:

> Conrad T. Pino <Conrad@Pino.com> writes:
>
> >Look line file "src/server.c" is "broken" in a way that's not clear.
> >The "blank line" problem I attempted to fix appears to be back.
>
> >Out of time, have an appointment, will report more later.
>
>
> Hmmm... there are no such characters in the file on UNIX boxen
> checkouts. Just the standard 0x0a newline at the end of the line:
>
> #if defined(SERVER_SUPPORT) || defined(CLIENT_SUPPORT)
>
> Could it be that the compiler does not like the #if line itself to have
> multiple defined lines? Are we looking at a different problem in the cvs
> client used for checkout?


That's certainly an odd place to be seeing a new error.  According to
`cvs annotate', that line has been around since 1995.  Could another
error be cascading?  Could something about your setup have added the
bad character?  Could some #define change have allowed new sections of
the code to be compiled on Windows when they weren't before?

It sounds like maybe your compiler was expecting a Windows EOL (\r\n)
and found a UNIX one (\n, or 0x0a).  Is your client set to check out
with UNIX EOLs (WinCVS and the stock CVS client compiled under Cygnus
of MKS is capable of this, but the stock CVS client compile Win32 will
not do this)?  Perhaps the UNIX-like diff tool you used is a little
too UNIX-like and converted your line endings to \n while it was working?

Cheers,

Derek
- --
Get CVS support at <http://ximbiot.com>!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFBP1fxLD1OTBfyMaQRArYpAJ9CpwismxnyKVWLzSolkrH3UabXsgCgjpL5
IbzjgUQLZNEUxq775dgygtU=
=q0xN
-----END PGP SIGNATURE-----