LYNX-DEV [patch] Macros redefined in HTNews.c

[Tomasz J. Cholewo]

Hi,

During compilation (IRIX6.2, cc compiler) I was getting the following
warnings:

cfe: Warning 581: ../../Library/Implementation/HTNews.c:25: Macro CR redefined.
cfe: Warning 581: ../../Library/Implementation/HTNews.c:26: Macro LF redefined.

They were caused by the fact that the macros CR and LF were already defined
in HTUtil.h which is included by HTNews.c.

The following CONTEXT patch corrects this problem and fixes some minor
typos in comments.

Tom

====== CUT HERE =======
diff -crd lynx2-7/WWW/Library/Implementation/HTNews.c 
lynx2-7-work/WWW/Library/Implementation/HTNews.c
*** lynx2-7/WWW/Library/Implementation/HTNews.c Mon Feb 10 16:51:42 1997
--- lynx2-7-work/WWW/Library/Implementation/HTNews.c    Tue Feb 11 20:07:58 1997
***************
*** 22,30 ****
  /* this define should be in HTFont.h :( */
  #define HT_NON_BREAK_SPACE ((char)1)   /* For now */
  
- #define CR   FROMASCII('\015')        /* Must be converted to ^M for 
transmission */
- #define LF   FROMASCII('\012')        /* Must be converted to ^J for 
transmission */
- 
  #define NEWS_PORT 119         /* See rfc977 */
  #define SNEWS_PORT 563                /* See Lou Montulli */
  #define APPEND                        /* Use append methods */
--- 22,27 ----
***************
*** 291,297 ****
  **
  ** For example, returns "address@hidden" if given any of
  **      " Lou Montulli <address@hidden> "
! **  or  " address@hidden ( Lou "The Stud" Montulli ) "
  */
  PRIVATE char * author_address ARGS1(char *,email)
  {
--- 288,294 ----
  **
  ** For example, returns "address@hidden" if given any of
  **      " Lou Montulli <address@hidden> "
! **  or  " address@hidden ( Lou "The Stud" Montulli ) "
  */
  PRIVATE char * author_address ARGS1(char *,email)
  {
***************
*** 407,413 ****
  ** On entry,
  **    HT      has a selection of zero length at the end.
  **    text    points to the text to be put into the file, 0 terminated.
! **    addr    points to the hypertext refernce address,
  **            terminated by white space, comma, NULL or '>' 
  */
  PRIVATE void write_anchor ARGS2(CONST char *,text, CONST char *,addr)
--- 404,410 ----
  ** On entry,
  **    HT      has a selection of zero length at the end.
  **    text    points to the text to be put into the file, 0 terminated.
! **    addr    points to the hypertext reference address,
  **            terminated by white space, comma, NULL or '>' 
  */
  PRIVATE void write_anchor ARGS2(CONST char *,text, CONST char *,addr)
***************
*** 1897,1903 ****
          {
            char * p = command + strlen(command);
            /*
!           **  Teminate command with CRLF, as in RFC 977.
            */
            *p++ = CR;          /* Macros to be correct on Mac */
            *p++ = LF;
--- 1894,1900 ----
          {
            char * p = command + strlen(command);
            /*
!           **  Terminate command with CRLF, as in RFC 977.
            */
            *p++ = CR;          /* Macros to be correct on Mac */
            *p++ = LF;
***************
*** 2084,2091 ****
            /*
            **  Ensure reader mode, but don't bother checking the
            **  status for anything but HT_INERRUPTED, because if
!           **  if the reader mode command is not needed, the server
!           **  probably return a 500, which is irrelevant at this
            **  point. - FM
            */
            char buffer[20];
--- 2081,2088 ----
            /*
            **  Ensure reader mode, but don't bother checking the
            **  status for anything but HT_INERRUPTED, because if
!           **  the reader mode command is not needed, the server
!           **  probably returned a 500, which is irrelevant at this
            **  point. - FM
            */
            char buffer[20];
***************
*** 2119,2125 ****
            s = -1;
            /*
            **  Message might be a leftover "Timeout-disconnected",
!           **  so try again if retries is not exhausted.
            */
            continue;
        }
--- 2116,2122 ----
            s = -1;
            /*
            **  Message might be a leftover "Timeout-disconnected",
!           **  so try again if retries are not exhausted.
            */
            continue;
        }
;
; To UNSUBSCRIBE:  Send a mail message to address@hidden
;                  with "unsubscribe lynx-dev" (without the
;                  quotation marks) on a line by itself.
;