Bug 608: fixes for compilation on AMD 64

diff --git a/CHANGES b/CHANGES
index 395c3973d27802f545853a1c88354c4271a75199..9ba22c82fce3e28392f49d76ba14b44f91aacfa8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX
 
+* small fixes for compilation on AMD-64 (14 Mar 2005)
 * fix a few timeouts in faxgetty (11 Mar 2005)
 * add support for TIFFTAG_FAXDCS (5 Mar 2005)
 * fix batching error in ECM to some receivers (5 Mar 2005)

diff --git a/faxstat/faxstat.c++ b/faxstat/faxstat.c++
index 9b8df52cefad7e729a859c80e36a05e88013182a..6385bbaa01696d2b0d3c3b2c3d15d000ac4c1e12 100644 (file)
--- a/faxstat/faxstat.c++
+++ b/faxstat/faxstat.c++
@@ -45,7 +45,7 @@ faxStatApp::faxStatApp() {}
 faxStatApp::~faxStatApp() {}
 
 static bool
-writeStdout(void*, const char* buf, int cc, fxStr&)
+writeStdout(int, const char* buf, int cc, fxStr&)
 {
     (void) Sys::write(STDOUT_FILENO, buf, cc);
     return (true);
@@ -101,7 +101,7 @@ faxStatApp::run(int argc, char** argv)
     if (callServer(emsg)) {
        if (login(NULL, emsg)) {
            if (checkInfo)
-               (void) recvData(writeStdout, NULL, emsg, 0,
+               (void) recvData(writeStdout, 0, emsg, 0,
                    "RETR " FAX_STATUSDIR "/any." FAX_INFOSUF);
            for (u_int i = 0, n = dirs.length(); i < n; i++) {
                header = (i > 0 ? "\n" : "");

diff --git a/hfaxd/FileTransfer.c++ b/hfaxd/FileTransfer.c++
index 8349ee69ad92907c1e99113f4f2f2909aaad428a..b19a99fc70dc40eb359934576f43d33c29617187 100644 (file)
--- a/hfaxd/FileTransfer.c++
+++ b/hfaxd/FileTransfer.c++
@@ -322,7 +322,7 @@ HylaFAXServer::sendTIFFHeader(TIFF* tif, int fdout)
     static DirTemplate templ = {
 #define        TIFFdiroff(v) \
     (uint32) (sizeof (TIFFHeader) + sizeof (uint16) + \
-      (unsigned) &(((DirTemplate*) 0)->v))
+      (unsigned long) &(((DirTemplate*) 0)->v))
        { TIFFTAG_SUBFILETYPE,          TIFF_LONG,      1 },
        { TIFFTAG_IMAGEWIDTH,           TIFF_LONG,      1 },
        { TIFFTAG_IMAGELENGTH,          TIFF_LONG,      1 },

diff --git a/util/FaxClient.c++ b/util/FaxClient.c++
index 24403aeea6be78357fe64f8bf07dbf88d4634b3d..7785577ea03870293298e8a982c69419e9d748be 100644 (file)
--- a/util/FaxClient.c++
+++ b/util/FaxClient.c++
@@ -1272,8 +1272,8 @@ bad:
  * or other data connection-based transfer.
  */
 bool
-FaxClient::recvData(bool (*f)(void*, const char*, int, fxStr&),
-    void* arg, fxStr& emsg, u_long restart, const char* fmt, ...)
+FaxClient::recvData(bool (*f)(int, const char*, int, fxStr&),
+    int arg, fxStr& emsg, u_long restart, const char* fmt, ...)
 {
     if ((!setMode(MODE_S)) ||
        (!initDataConn(emsg)) ||

diff --git a/util/FaxClient.h b/util/FaxClient.h
index 8b04126815e9cfd0fd7b0da98dda117f4ea312fc..49cbb3f9535f999b8c5cbfd90860eaedf16d90a6 100644 (file)
--- a/util/FaxClient.h
+++ b/util/FaxClient.h
@@ -274,8 +274,8 @@ public:
     /*
      * Retrieve information from the server.
      */
-    bool recvData(bool (*f)(void*, const char*, int, fxStr&),
-    void* arg, fxStr& emsg, u_long restart, const char* fmt, ...);
+    bool recvData(bool (*f)(int, const char*, int, fxStr&),
+    int arg, fxStr& emsg, u_long restart, const char* fmt, ...);
     bool recvZData(bool (*f)(void*, const char*, int, fxStr&),
     void* arg, fxStr& emsg, u_long restart, const char* fmt, ...);
     /*

diff --git a/util/faxfetch.c++ b/util/faxfetch.c++
index ee761aa4161cbf26444be79ce029ff4b84997fbf..6577f48be94e518ba128f66704f87828044c5653 100644 (file)
--- a/util/faxfetch.c++
+++ b/util/faxfetch.c++
@@ -40,12 +40,18 @@ faxFetchApp::faxFetchApp() {}
 faxFetchApp::~faxFetchApp() {}
 
 static bool
-writeStdout(void*, const char* buf, int cc, fxStr&)
+writeStdout(int, const char* buf, int cc, fxStr&)
 {
     (void) Sys::write(STDOUT_FILENO, buf, cc);
     return (true);
 }
 
+static bool
+writeStdout(void*, const char* buf, int cc, fxStr&)
+{
+    return writeStdout(0,buf,cc);
+}
+
 void
 faxFetchApp::vtraceServer(const char* fmt, va_list ap)
 {
@@ -92,7 +98,7 @@ faxFetchApp::run(int argc, char** argv)
                setType(TYPE_I);        // always image type
                for (; optind < argc; optind++)
                    if (mode == MODE_S)
-                       recvData(writeStdout, NULL, emsg, page, op | argv[optind]);
+                       recvData(writeStdout, 0, emsg, page, op | argv[optind]);
                    else
                        recvZData(writeStdout, NULL, emsg, page, op | argv[optind]);
            }

diff --git a/util/faxwatch.c++ b/util/faxwatch.c++
index f1f9984e9e05e7a66797e21aef2dda77e5572a6d..9a7c886d8f9b0c0f59b1d218e8fb0810a2481da6 100644 (file)
--- a/util/faxwatch.c++
+++ b/util/faxwatch.c++
@@ -46,9 +46,9 @@ watchApp::watchApp() {}
 watchApp::~watchApp() {}
 
 static bool
-writeData(void* arg, const char* buf, int cc, fxStr& emsg)
+writeData(int arg, const char* buf, int cc, fxStr& emsg)
 {
-    if (Sys::write((int) arg, buf, cc) != cc) {
+    if (Sys::write( arg, buf, cc) != cc) {
        emsg = fxStr::format("write error: %s", strerror(errno));
        return (false);
     } else
@@ -96,7 +96,7 @@ watchApp::run(int argc, char** argv)
        if (login(NULL, emsg) && setType(TYPE_A)) {
            if (getTimeZone() == TZ_GMT)
                printWarning("time values reported in GMT");
-           (void) recvData(writeData, (void*) STDOUT_FILENO, emsg, 0,
+           (void) recvData(writeData, STDOUT_FILENO, emsg, 0,
                "SITE TRIGGER %s", argv[optind]);
        }
        hangupServer();