[Bug 390] Fix AIX 4.3.3 build problem. Lee's patch made from suggestions

by Aldo Mini

diff --git a/util/TextFmt.c++ b/util/TextFmt.c++
index 1aba39f2343b70033ed1ce7b31e31c50efc809c9..f5f8584a571add05906dac24d94db8344a6bc480 100644 (file)
--- a/util/TextFmt.c++
+++ b/util/TextFmt.c++
@@ -331,7 +331,7 @@ TextFmt::Copy_Block(off_t b1, off_t b2)
 {
     char buf[16*1024];
     for (off_t k = b1; k <= b2; k += sizeof (buf)) {
-       size_t cc = (size_t) fxmin(sizeof (buf), (unsigned) (b2-k+1));
+       size_t cc = (size_t) fxmin(sizeof (buf), (size_t) (b2-k+1));
        fseek(tf, (long) k, SEEK_SET);          // position to desired block
        if (fread(buf, 1, (size_t) cc, tf) != cc)
            fatal("Read error during reverse collation: %s", strerror(errno));

diff --git a/util/TypeRules.h b/util/TypeRules.h
index 6cf38e837963cccf9ef2102469b539bf4516db4b..84209e7df2eb91c65ad2b4ce5e0ee3a460c8d4fd 100644 (file)
--- a/util/TypeRules.h
+++ b/util/TypeRules.h
@@ -162,7 +162,7 @@ public:
     TypeRule(const TypeRule& other);
     virtual ~TypeRule();
 
-    bool       match(const void*, u_int size, bool verbose = false) const;
+    bool       match(const void*, size_t size, bool verbose = false) const;
     bool       isContinuation() const;
 
     TypeResult getResult() const;

diff --git a/util/faxadduser.c b/util/faxadduser.c
index 7784901ef0f0e6131f338ca41bfd008a4359a4cb..63b22859e6d71ff8788af05e9f052b1aafec1cae 100644 (file)
--- a/util/faxadduser.c
+++ b/util/faxadduser.c
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <ctype.h>
+#include <time.h>
 
 #include "config.h"
 #include "port.h"

diff --git a/util/faxconfig.c b/util/faxconfig.c
index 02b46a67190e97adac3d587e56ce706c79b992ab..247e2fef231166ad10106c8334aab82f13e88adc 100644 (file)
--- a/util/faxconfig.c
+++ b/util/faxconfig.c
@@ -120,7 +120,7 @@ main(int argc, char** argv)
                 quote = 1;
             }
             cmdsize = strlen(argv[optind]) + strlen(argv[optind+1]) + 10;
-            cmd = malloc(cmdsize);
+            cmd = (char*) malloc(cmdsize);
             if (quote) {
                 cmdlen = snprintf(cmd, cmdsize, "C%s%s:\"%s\"",
                     isQueuer ? ":" : "", argv[optind], argv[optind+1]);