[master]

    [rt33032]
    Move declaration of fudge so it's only declared if we will use it.

diff --git a/RELNOTES b/RELNOTES
index a58673e4e87cfe9dc3cc56075e97207afd35c663..a37ab9754792da11c900d83fe2b0aeb850bbb5f8 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -66,6 +66,10 @@ work on other platforms. Please report any problems and suggested fixes to
 - Use newer auto* tool packages and turn on RFC_3542 support on Mac OS.
   [ISC-Bugs #26303]
 
+- Remove a variable when it isn't being used due to #ifdefs to avoid
+  a compiler warning on Solaris using GCC.
+  [ISC-Bugs #33032]
+
                        Changes since 4.2.4
 
 - Correct code to calculate timing values in client to compare

diff --git a/common/dlpi.c b/common/dlpi.c
index 8f2c73dcf0d48a36160baf4526214786755d6657..391fb91f3e9bac160ee59a798b4fc0781f094cd8 100644 (file)
--- a/common/dlpi.c
+++ b/common/dlpi.c
@@ -526,6 +526,7 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 {
 #ifdef USE_DLPI_RAW
        double hh [32];
+       int fudge;
 #endif
        double ih [1536 / sizeof (double)];
        unsigned char *dbuf = (unsigned char *)ih;
@@ -533,7 +534,6 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
        unsigned char dstaddr [DLPI_MAXDLADDR];
        unsigned addrlen;
        int result;
-       int fudge;
 
        if (!strcmp (interface -> name, "fallback"))
                return send_fallback (interface, packet, raw,
@@ -552,8 +552,6 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
        fudge = dbuflen % 4; /* IP header must be word-aligned. */
        memcpy (dbuf + fudge, (unsigned char *)hh, dbuflen);
        dbuflen += fudge;
-#else
-       fudge = 0;
 #endif
        assemble_udp_ip_header (interface, dbuf, &dbuflen, from.s_addr,
                                to -> sin_addr.s_addr, to -> sin_port,