HEAD does not compile on IRIX 6.5

[Steve Langasek]

Hi Greg,

This looks like you made changes  to your local copy of the CVS sources, and
cvs was unable to automatically reconcile your modifications with the upstream
changes.  You may want to edit the file in question to manually reconcile the
differences (just search for '<<<<', '====', and '>>>>' in the file -- all are
rather rare in C), or if the local changes are unimportant or unintentional,
you can delete the file and 'cvs update' to get a fresh copy.

If you still get this problem after re-grabbing the file, then someone's
really made a mess of the CVS tree :)

Regards,
Steve Langasek
postmodern programmer

On Sat, 23 Dec 2000, Greg Dickie wrote:

> Compiling lib/util_unistr.c
> cc-1029 cc: ERROR File = lib/util_unistr.c, Line = 285
>   An expression is expected at this point.
> 
>   <<<<<<< util_unistr.c
>   ^
> 
> cc-1241 cc: ERROR File = lib/util_unistr.c, Line = 287
>   A declaration cannot appear after an executable statement in a block.
> 
>         uint16 *src;
>         ^
> 
> cc-1029 cc: ERROR File = lib/util_unistr.c, Line = 288
>   An expression is expected at this point.
> 
>   =======
>   ^
> 
> cc-1241 cc: ERROR File = lib/util_unistr.c, Line = 290
>   A declaration cannot appear after an executable statement in a block.
> 
>         uint16 *src;
>         ^
> 
> cc-1101 cc: ERROR File = lib/util_unistr.c, Line = 290
>   "src" has already been declared in the current scope.
> 
>         uint16 *src;
>                 ^
> 
> cc-1029 cc: ERROR File = lib/util_unistr.c, Line = 291
>   An expression is expected at this point.
> 
>   >>>>>>> 1.51
>   ^
> 
> cc-1029 cc: ERROR File = lib/util_unistr.c, Line = 293
>   An expression is expected at this point.
> 
>   <<<<<<< util_unistr.c
>   ^
> 
> cc-1029 cc: ERROR File = lib/util_unistr.c, Line = 296
>   An expression is expected at this point.
> 
>   =======
>   ^
> 
> cc-1029 cc: ERROR File = lib/util_unistr.c, Line = 298
>   An expression is expected at this point.
> 
>   =======
>   ^
> 
> cc-1012 cc: WARNING File = lib/util_unistr.c, Line = 307
>   Parsing restarts here after previous syntax error.
> 
>         src = str->buffer;
>                          ^
> 
> cc-1020 cc: ERROR File = lib/util_unistr.c, Line = 308
>   The identifier "len" is undefined.
> 
>         len = MIN(str->uni_str_len, maxlen);
>         ^
> 
> cc-1020 cc: ERROR File = lib/util_unistr.c, Line = 315
>   The identifier "p" is undefined.
> 
>         for (p = dest; (p-dest < len) && *src; src++) {
>              ^
> 
> cc-1551 cc: WARNING File = lib/util_unistr.c, Line = 315
>   The variable "src" is used before its value is set.
> 
>         for (p = dest; (p-dest < len) && *src; src++) {
>                                           ^
> 
> cc-1174 cc: WARNING File = lib/util_unistr.c, Line = 287
>   The variable "src" was declared but never referenced.
> 
>         uint16 *src;
>                 ^
> 
> 11 errors detected in the compilation of "lib/util_unistr.c".
> *** Error code 2 (bu21)
> 
> 
> ---------------------------------------------------------------------
> Greg Dickie
> just a guy
> greg at discreet.com
> 
>