You can't always cast pointer to int on because the sizes are

different; use intptr_t

2 files changed, 13 insertions, 11 deletions

diff --git a/gnu/usr.sbin/mkhybrid/src/match.c b/gnu/usr.sbin/mkhybrid/src/match.c
index 7dea9c08526..e9bb2f0f591 100644
--- a/gnu/usr.sbin/mkhybrid/src/match.c
+++ b/gnu/usr.sbin/mkhybrid/src/match.c
@@ -12,7 +12,7 @@
  */
 #endif /* APPLE_HYB */
 
-static char rcsid[] ="$Id: match.c,v 1.1 2000/10/10 20:40:17 beck Exp $";
+static char rcsid[] ="$Id: match.c,v 1.2 2002/11/03 20:27:03 pvalchev Exp $";
 
 #include "config.h"
 #include <prototyp.h>
@@ -24,6 +24,7 @@ static char rcsid[] ="$Id: match.c,v 1.1 2000/10/10 20:40:17 beck Exp $";
 #include <stdlib.h>
 #endif
 #endif
+#include <inttypes.h>
 #include <string.h>
 #include "match.h"
 
@@ -114,9 +115,9 @@ char * fn;
   return 0; /* not found -> not excluded */
 }
 
-int i_ishidden()
+intptr_t i_ishidden()
 {
-  return((int)i_mat[0]);
+  return((intptr_t)i_mat[0]);
 }
 
 /* Joliet hide */
@@ -164,9 +165,9 @@ char * fn;
   return 0; /* not found -> not excluded */
 }
 
-int j_ishidden()
+intptr_t j_ishidden()
 {
-  return((int)j_mat[0]);
+  return((intptr_t)j_mat[0]);
 }
 
 #ifdef APPLE_HYB
@@ -234,9 +235,9 @@ char * fn;
   return 0; /* not found -> not excluded */
 }
 
-int hfs_ishidden()
+intptr_t hfs_ishidden()
 {
-  return((int)hfs_mat[0]);
+  return((intptr_t)hfs_mat[0]);
 }
 
 /* These will probably appear in mkisofs in the future */
diff --git a/gnu/usr.sbin/mkhybrid/src/match.h b/gnu/usr.sbin/mkhybrid/src/match.h
index 9f627cf0ffa..404872dd85f 100644
--- a/gnu/usr.sbin/mkhybrid/src/match.h
+++ b/gnu/usr.sbin/mkhybrid/src/match.h
@@ -5,18 +5,19 @@
  */
 
 /*
- * 	$Id: match.h,v 1.1 2000/10/10 20:40:18 beck Exp $
+ * 	$Id: match.h,v 1.2 2002/11/03 20:27:03 pvalchev Exp $
  */
 
+#include <inttypes.h>
 #include "fnmatch.h"
 
 int matches	__PR((char *fn));
 
 int i_matches	__PR((char *fn));
-int i_ishidden	__PR((void));
+intptr_t i_ishidden	__PR((void));
 
 int j_matches	__PR((char *fn));
-int j_ishidden	__PR((void));
+intptr_t j_ishidden	__PR((void));
 
 #ifdef APPLE_HYB
 int add_match	__PR((char *fn));
@@ -25,7 +26,7 @@ int j_add_match __PR((char *fn));
 
 int hfs_add_match __PR((char *fn));
 int hfs_matches __PR((char *fn));
-int hfs_ishidden __PR((void));
+intptr_t hfs_ishidden __PR((void));
 
 void add_list __PR((char *fn));
 void i_add_list __PR((char *fn));