Kinsey Moore started a new discussion on cpukit/libcsupport/src/realpath.c: 
https://gitlab.rtems.org/rtems/rtos/rtems/-/merge_requests/971#note_140713

 >                      if (p != NULL) {
 >                              if (symlink[slen - 1] != '/') {
 >  #ifdef __rtems__
 > +<<<<<<< HEAD
 >                                      if ((size_t)(slen + 1) >= 
 > sizeof(symlink)) {
 > +=======
 > +                                    if (slen + 1 >= 
 > (ssize_t)sizeof(symlink)) {
 > +>>>>>>> f7c5c56e47 (cpukit/libcsupport: Address -Wsign-compare warnings)

Merge conflict needs to be resolved.

-- 
View it on GitLab: 
https://gitlab.rtems.org/rtems/rtos/rtems/-/merge_requests/971#note_140713
You're receiving this email because of your account on gitlab.rtems.org.


_______________________________________________
bugs mailing list
[email protected]
http://lists.rtems.org/mailman/listinfo/bugs

Reply via email to