Minor adjustments for compiling on OpenServer, per Tim.

diff --git a/faxd/Class1Send.c++ b/faxd/Class1Send.c++
index ce0b6e3ddd266ce68183d74a8280b479e397c4bf..db0b2846809d62897415fbed9adbd854ccf8b140 100644 (file)
--- a/faxd/Class1Send.c++
+++ b/faxd/Class1Send.c++
@@ -1039,14 +1039,15 @@ Class1Modem::blockFrame(const u_char* bitrev, bool lastframe, u_int ppmcmd, fxSt
                // we intentionally do not send the FCS bytes as the DCE regenerates them
                // send fcount frames separated by <DLE><ETX>
                buf[0] = DLE; buf[1] = ETX;
-               for (u_short v34frame = 0; v34frame < fcount; v34frame++) {
+               u_short v34frame;
+               for (v34frame = 0; v34frame < fcount; v34frame++) {
                    if (!putModemDLEData(ecmStuffedBlock, frameSize + 4, bitrev, getDataTimeout()))
                        return (false);
                    if (!putModemData(buf, 2)) return (false);
                    ecmStuffedBlock += (frameSize + 6);
                }
                // send 3 RCP frames separated by <DLE><ETX>
-               for (u_short v34frame = 0; v34frame < 3; v34frame++) {
+               for (v34frame = 0; v34frame < 3; v34frame++) {
                    if (!putModemDLEData(ecmStuffedBlock, 3, bitrev, getDataTimeout()))
                        return (false);
                    if (!putModemData(buf, 2)) return (false);

diff --git a/faxd/G3Encoder.c++ b/faxd/G3Encoder.c++
index f23a4e33a40f20d815a3bc4e92aac8f23be14867..4c8160ce511c58958364d29456f086eb1f0c6edf 100644 (file)
--- a/faxd/G3Encoder.c++
+++ b/faxd/G3Encoder.c++
@@ -258,6 +258,15 @@ G3Encoder::find1span(const u_char* bp, int bs, int be)
        return (span);
 }
 
+/*
+ * Write a code to the output stream.
+ */
+inline void
+G3Encoder::putcode(const tableentry& te)
+{
+    putBits(te.code, te.length);
+}
+
 /*
  * Return the offset of the next bit in the range
  * [bs..be] that is different from the specified
@@ -367,15 +376,6 @@ G3Encoder::encoderCleanup()
        flushBits();
 }
 
-/*
- * Write a code to the output stream.
- */
-inline void
-G3Encoder::putcode(const tableentry& te)
-{
-    putBits(te.code, te.length);
-}
-
 /*
  * Write the sequence of codes that describes
  * the specified span of zero's or one's.  The