diff options
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | lbl/os-hpux11.h | 23 | ||||
| -rw-r--r-- | optimize.c | 14 |
3 files changed, 8 insertions, 30 deletions
diff --git a/Makefile.in b/Makefile.in index f236c919..6096060d 100644 --- 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 index 42c6b60d..00000000 --- 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); @@ -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. |