Skip to content

Commit 2cf6085

Browse files
committed
Remove more Ultrix-specific props.
See also commit 04c3be6.
1 parent 7e6c85b commit 2cf6085

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

cmakeconfig.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,6 @@
258258
/* define on AIX to get certain functions */
259259
#cmakedefine _SUN 1
260260

261-
/* to handle Ultrix compilers that don't support const in prototypes */
262-
#cmakedefine const 1
263-
264261
/* Define as token for inline if inlining supported */
265262
#cmakedefine inline 1
266263

parsenfsfh.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,6 @@ Parse_fh(netdissect_options *ndo, const unsigned char *fh, u_int len,
118118
#if defined(SUNOS5)
119119
fhtype = FHT_SUNOS5;
120120
#endif
121-
#if defined(ultrix)
122-
fhtype = FHT_ULTRIX;
123-
#endif
124121
#if defined(__osf__)
125122
fhtype = FHT_DECOSF;
126123
#endif

print-atalk.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,10 @@ atp_bitmap_print(netdissect_options *ndo,
427427
* The '& 0xff' below is needed for compilers that want to sign
428428
* extend a u_char, which is the case with the Ultrix compiler.
429429
* (gcc is smart enough to eliminate it, at least on the Sparc).
430+
*
431+
* FIXME: If this problem no longer exists, this workaround should be
432+
* removed. Otherwise the problem should be consistently detected and
433+
* handled, perhaps at build time.
430434
*/
431435
if ((bm + 1) & (bm & 0xff)) {
432436
char c = '<';

print-fddi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ struct fddi_header {
8484
/*
8585
* Some FDDI interfaces use bit-swapped addresses.
8686
*/
87-
#if defined(ultrix) || defined(__alpha) || defined(__bsdi) || defined(__NetBSD__) || defined(__linux__)
87+
#if defined(__alpha) || defined(__bsdi) || defined(__NetBSD__) || defined(__linux__)
8888
static int fddi_bitswap = 0;
8989
#else
9090
static int fddi_bitswap = 1;

0 commit comments

Comments
 (0)