Fix crash in libecho.c on win64 build

Return value of _findfirst is intptr_t; see
https://msdn.microsoft.com/en-us/library/zyzxfzac.aspx

[ghudson@mit.edu: also fix plugins.c]

ticket: 8230

diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c
index 826390976ab8f2d31f8996dd9fcb6704a6431477..b0bb2ada87558bd150694c5bdbbd56a5837020ee 100644 (file)
--- a/src/util/support/plugins.c
+++ b/src/util/support/plugins.c
@@ -96,7 +96,7 @@ struct dirent {
 };
 
 typedef struct {
-    long handle;                /* _findfirst/_findnext handle */
+    intptr_t handle;            /* _findfirst/_findnext handle */
     short offset;               /* offset into directory */
     short finished;             /* 1 if there are not more files */
     struct _finddata_t fileinfo;/* from _findfirst/_findnext */
@@ -108,7 +108,7 @@ DIR * opendir(const char *dir)
 {
     DIR *dp;
     char *filespec;
-    long handle;
+    intptr_t handle;
     int index;
 
     filespec = malloc(strlen(dir) + 2 + 1);

diff --git a/src/util/windows/libecho.c b/src/util/windows/libecho.c
index a10eee2323f44350b4db9939bdb380ec76597455..f42462491ec70bbb3bd3f5e2200301df18b642cc 100644 (file)
--- a/src/util/windows/libecho.c
+++ b/src/util/windows/libecho.c
@@ -38,7 +38,7 @@ main(int argc, char *argv[])
 void
 echo_files(char *prefix, char *f)
 {
-    long ff;
+    intptr_t ff;
     struct _finddata_t fdt;
     char *slash;
     char filepath[256];