Remove prototype header for HP-UX 11.x.

HP-UX 11.00 was released in 1997; lbl/os-hpux11.h was introduced via
commit 7ec2e59 in 2002.  The only prototype in the header is for ffs(),
and HP-UX 11.31 (11i v3), which was released in 2007, has the prototype,
albeit not in the standard header.  Remove lbl/os-hpux11.h and update
the lowest_set_bit() block in optimize.c to recognize HP-UX specifics.

diff --git a/Makefile.in b/Makefile.in
index f236c919d4028ca1324eb76a2974a0c7b5c6e84a..6096060d9370f0ef8b4f243aec79ae9d5578e7d8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -286,7 +286,6 @@ EXTRA_DIST = \
        fad-glifc.c \
        grammar.y.in \
        install-sh \
-       lbl/os-hpux11.h \
        lbl/os-osf4.h \
        lbl/os-osf5.h \
        libpcap.pc.in \

diff --git a/lbl/os-hpux11.h b/lbl/os-hpux11.h
deleted file mode 100644 (file)
index 42c6b60..0000000
--- a/lbl/os-hpux11.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995, 1996, 1997
- *     The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* Prototypes missing in HP-UX 11.x */
-int    ffs(int i);

diff --git a/optimize.c b/optimize.c
index 9af4c15d2ca71a1f40f38dfdc3b743c99818d14a..94ecfc15f5edbc7f0895a5d0a85324b7072f5999 100644 (file)
--- a/optimize.c
+++ b/optimize.c
@@ -141,12 +141,6 @@ lowest_set_bit(int mask)
                abort();        /* mask is zero */
        return (u_int)bit;
 }
-#elif defined(MSDOS) && defined(__DJGPP__)
-  /*
-   * MS-DOS with DJGPP, which declares ffs() in <string.h>, which
-   * we've already included.
-   */
-  #define lowest_set_bit(mask) ((u_int)(ffs((mask)) - 1))
 #elif (defined(MSDOS) && defined(__WATCOMC__)) || defined(STRINGS_H_DECLARES_FFS)
   /*
    * MS-DOS with Watcom C, which has <strings.h> and declares ffs() there,
@@ -155,6 +149,14 @@ lowest_set_bit(int mask)
    */
   #include <strings.h>
   #define lowest_set_bit(mask) (u_int)((ffs((mask)) - 1))
+#elif (defined(MSDOS) && defined(__DJGPP__)) || defined(__hpux)
+  /*
+   * MS-DOS with DJGPP or HP-UX 11i v3, which declare ffs() in <string.h>,
+   * which we've already included.  Place this branch after the <strings.h>
+   * branch, in case a later release of HP-UX makes the declaration available
+   * via the standard header.
+   */
+  #define lowest_set_bit(mask) ((u_int)(ffs((mask)) - 1))
 #else
 /*
  * None of the above.