question about gettext.c line 792

[Wendy Palm]

i discovered a small problem compiling "make-3.79.1" on a cray.
it doesn't consider the prototype and the inline function
compatible.  is this line really necessary for anyone?  
i deleted it and it seemed fine on a linux machine.

$ diff -u gettext.c.orig gettext.c
--- gettext.c.orig      Wed Feb  9 01:02:18 2000
+++ gettext.c   Fri Aug 24 16:00:30 2001
@@ -789,7 +789,6 @@
 # include <byteswap.h>
 # define SWAP(i) bswap_32 (i)
 #else
-static nls_uint32 SWAP PARAMS ((nls_uint32 i));
 
 static inline nls_uint32
 SWAP (i)

===========================================================
also, just to eliminate some annoying warning messages on the
cray, glob.c realloc calls, and function.c find_next_token calls
needed a change:

$ diff -c glob.c.orig glob.c
*** glob.c.orig Fri Jan 21 23:43:03 2000
--- glob.c      Fri Aug 24 18:57:15 2001
***************
*** 147,153 ****
  #  include <memory.h>
  # endif
  
! extern char *malloc (), *realloc ();
  extern void free ();
  
  extern void qsort ();
--- 147,154 ----
  #  include <memory.h>
  # endif
  
! extern char *malloc ();
! extern void *realloc ();
  extern void free ();
  
  extern void qsort ();
***************
*** 811,817 ****
              && S_ISDIR (st.st_mode)))
        {
          pglob->gl_pathv
!           = (char **) realloc (pglob->gl_pathv,
                                 (pglob->gl_pathc +
                                  ((flags & GLOB_DOOFFS) ?
                                   pglob->gl_offs : 0) +
--- 812,818 ----
              && S_ISDIR (st.st_mode)))
        {
          pglob->gl_pathv
!           = (char **) realloc (pglob->gl_pathv[0],
                                 (pglob->gl_pathc +
                                  ((flags & GLOB_DOOFFS) ?
                                   pglob->gl_offs : 0) +
***************
*** 930,936 ****
  
              /* This is an pessimistic guess about the size.  */
              pglob->gl_pathv
!               = (char **) realloc (pglob->gl_pathv,
                                     (pglob->gl_pathc +
                                      ((flags & GLOB_DOOFFS) ?
                                       pglob->gl_offs : 0) +
--- 931,937 ----
  
              /* This is an pessimistic guess about the size.  */
              pglob->gl_pathv
!               = (char **) realloc (pglob->gl_pathv[0],
                                     (pglob->gl_pathc +
                                      ((flags & GLOB_DOOFFS) ?
                                       pglob->gl_offs : 0) +
***************
*** 985,991 ****
              pglob->gl_flags = flags;
  
              /* Now we know how large the gl_pathv vector must be.  */
!             new_pathv = (char **) realloc (pglob->gl_pathv,
                                             ((pglob->gl_pathc + 1)
                                              * sizeof (char *)));
              if (new_pathv != NULL)
--- 986,992 ----
              pglob->gl_flags = flags;
  
              /* Now we know how large the gl_pathv vector must be.  */
!             new_pathv = (char **) realloc (pglob->gl_pathv[0],
                                             ((pglob->gl_pathc + 1)
                                              * sizeof (char *)));
              if (new_pathv != NULL)
***************
*** 1376,1382 ****
    if (nfound != 0)
      {
        pglob->gl_pathv
!       = (char **) realloc (pglob->gl_pathv,
                             (pglob->gl_pathc +
                              ((flags & GLOB_DOOFFS) ? pglob->gl_offs : 0) +
                              nfound + 1) *
--- 1377,1383 ----
    if (nfound != 0)
      {
        pglob->gl_pathv
!       = (char **) realloc (pglob->gl_pathv[0],
                             (pglob->gl_pathc +
                              ((flags & GLOB_DOOFFS) ? pglob->gl_offs : 0) +
                              nfound + 1) *

$ diff -c function.c.orig function.c
*** function.c.orig     Tue Jun 20 09:00:16 2000
--- function.c  Fri Aug 24 19:16:28 2001
***************
*** 128,134 ****
    unsigned int pattern_prepercent_len, pattern_postpercent_len;
    unsigned int replace_prepercent_len, replace_postpercent_len = 0;
    char *t;
!   int len;
    int doneany = 0;
  
    /* We call find_percent on REPLACE before checking PATTERN so that REPLACE
--- 128,134 ----
    unsigned int pattern_prepercent_len, pattern_postpercent_len;
    unsigned int replace_prepercent_len, replace_postpercent_len = 0;
    char *t;
!   unsigned int len;
    int doneany = 0;
  
    /* We call find_percent on REPLACE before checking PATTERN so that REPLACE
***************
*** 742,748 ****
  
  
    end_p = argv[1];
!   while ((p = find_next_token (&end_p, 0)) != 0)
      if (--i == 0)
        break;
  
--- 742,748 ----
  
  
    end_p = argv[1];
!   while ((p = find_next_token (&end_p, (unsigned int *) 0)) != 0)
      if (--i == 0)
        break;
  
***************
*** 775,787 ****
        char *end_p = argv[2];
  
        /* Find the beginning of the "start"th word.  */
!       while (((p = find_next_token (&end_p, 0)) != 0) && --start)
          ;
  
        if (p)
          {
            /* Find the end of the "count"th word from start.  */
!           while (--count && (find_next_token (&end_p, 0) != 0))
              ;
  
            /* Return the stuff in the middle.  */
--- 775,787 ----
        char *end_p = argv[2];
  
        /* Find the beginning of the "start"th word.  */
!       while (((p = find_next_token (&end_p, (unsigned int *) 0)) != 0) && 
--start)
          ;
  
        if (p)
          {
            /* Find the end of the "count"th word from start.  */
!           while (--count && (find_next_token (&end_p, (unsigned int *) 0) != 
0))
              ;
  
            /* Return the stuff in the middle.  */


-- 
wendy palm
Cray OS Sustaining Engineering, Cray Inc.
address@hidden, 651-605-9154