Remove more Ultrix-specific props.

See also commit 04c3be6.

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 58450a8ae418b993412cab469eead320d216fb82..98483a8517dd8e47c97a6f4cdf777be75ee0b34a 100644 (file)
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -258,9 +258,6 @@
 /* define on AIX to get certain functions */
 #cmakedefine _SUN 1
 
-/* to handle Ultrix compilers that don't support const in prototypes */
-#cmakedefine const 1
-
 /* Define as token for inline if inlining supported */
 #cmakedefine inline 1
 

diff --git a/parsenfsfh.c b/parsenfsfh.c
index a6186885f6731a7e400f06889fe389fd5a7f1337..79f7614cfbfddc15df7445713282182dcd361efd 100644 (file)
--- a/parsenfsfh.c
+++ b/parsenfsfh.c
@@ -118,9 +118,6 @@ Parse_fh(netdissect_options *ndo, const unsigned char *fh, u_int len,
 #if    defined(SUNOS5)
                    fhtype = FHT_SUNOS5;
 #endif
-#if    defined(ultrix)
-                   fhtype = FHT_ULTRIX;
-#endif
 #if    defined(__osf__)
                    fhtype = FHT_DECOSF;
 #endif

diff --git a/print-atalk.c b/print-atalk.c
index 659463a925c9b9c4c095d2f0443476034d0ec5b7..56fece45750f9d2faf336a5278708df87d868927 100644 (file)
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -427,6 +427,10 @@ atp_bitmap_print(netdissect_options *ndo,
         * The '& 0xff' below is needed for compilers that want to sign
         * extend a u_char, which is the case with the Ultrix compiler.
         * (gcc is smart enough to eliminate it, at least on the Sparc).
+        *
+        * FIXME: If this problem no longer exists, this workaround should be
+        * removed.  Otherwise the problem should be consistently detected and
+        * handled, perhaps at build time.
         */
        if ((bm + 1) & (bm & 0xff)) {
                char c = '<';

diff --git a/print-fddi.c b/print-fddi.c
index e8e84ba6eb48842e24f4a2c5debffc8896a82d4e..f95d707c503e8fe5745ae3443ef46de57c99e437 100644 (file)
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -84,7 +84,7 @@ struct fddi_header {
 /*
  * Some FDDI interfaces use bit-swapped addresses.
  */
-#if defined(ultrix) || defined(__alpha) || defined(__bsdi) || defined(__NetBSD__) || defined(__linux__)
+#if defined(__alpha) || defined(__bsdi) || defined(__NetBSD__) || defined(__linux__)
 static int fddi_bitswap = 0;
 #else
 static int fddi_bitswap = 1;